Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix stream for some cameras #22747

Merged
merged 1 commit into from Apr 5, 2019

Conversation

Projects
None yet
4 participants
@hunterjm
Copy link
Contributor

commented Apr 5, 2019

Description:

This was tested against the doorbird camera of olbjan on discord, as well as my HikVisions that were previously already working. Hopefully it will work for the Axis cameras @Kane610 is working on as well - please confirm.

The issue appears to be that the previous method would create a libx264 encoder codec when passed h264. I then copied over the video format from the input stream so that it would match and I could properly remux the stream. The reason for doing it this way was to be able to eventually drop in transcoding support without many changes as to how the output stream got created.

Unfortunately, for some feeds, that does not appear to work correctly, and since we only support remuxing streams at this point, it is much easier to pass in the input video stream as a template to the new output stream, and fixes the problems for the Doorbird without breaking my HikVisions.

See here for the differences on how the codec gets created.

Related issue (if applicable): #22593

Pull request in home-assistant.io with documentation (if applicable): N/A

Checklist:

  • The code change is tested and works locally.
  • Local tests pass with tox. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.

@hunterjm hunterjm added this to the 0.91.1 milestone Apr 5, 2019

@ghost ghost assigned hunterjm Apr 5, 2019

@ghost ghost added the in progress label Apr 5, 2019

@codecov

This comment has been minimized.

Copy link

commented Apr 5, 2019

Codecov Report

Merging #22747 into dev will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##              dev   #22747      +/-   ##
==========================================
+ Coverage   93.83%   93.84%   +<.01%     
==========================================
  Files         449      449              
  Lines       36584    36567      -17     
==========================================
- Hits        34330    34315      -15     
+ Misses       2254     2252       -2
Impacted Files Coverage Δ
homeassistant/components/stream/worker.py 93.61% <100%> (-0.07%) ⬇️
homeassistant/components/deconz/switch.py 100% <0%> (ø) ⬆️
homeassistant/components/deconz/binary_sensor.py 91.66% <0%> (ø) ⬆️
homeassistant/components/deconz/deconz_device.py 100% <0%> (ø) ⬆️
homeassistant/components/deconz/climate.py 98.18% <0%> (ø) ⬆️
homeassistant/components/deconz/scene.py 100% <0%> (ø) ⬆️
homeassistant/components/deconz/cover.py 100% <0%> (ø) ⬆️
homeassistant/components/deconz/const.py 100% <0%> (ø) ⬆️
homeassistant/components/deconz/light.py 100% <0%> (ø) ⬆️
homeassistant/components/deconz/sensor.py 95.89% <0%> (ø) ⬆️
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6996fec...0b416c0. Read the comment docs.

@Kane610 Kane610 referenced this pull request Apr 5, 2019

Merged

Axis - support stream #22593

3 of 4 tasks complete
@Kane610

This comment has been minimized.

Copy link
Contributor

commented Apr 5, 2019

Axis component is verified to work with this fix 🎉

@balloob

balloob approved these changes Apr 5, 2019

@balloob balloob merged commit 8c657d4 into home-assistant:dev Apr 5, 2019

13 checks passed

build Workflow: build
Details
ci/circleci: pre-install-all-requirements Your tests passed on CircleCI!
Details
ci/circleci: pre-test 3.5.5 Your tests passed on CircleCI!
Details
ci/circleci: pre-test 3.6 Your tests passed on CircleCI!
Details
ci/circleci: pre-test 3.7 Your tests passed on CircleCI!
Details
ci/circleci: pylint Your tests passed on CircleCI!
Details
ci/circleci: static-check Your tests passed on CircleCI!
Details
ci/circleci: test 3.5.5 Your tests passed on CircleCI!
Details
ci/circleci: test 3.6 Your tests passed on CircleCI!
Details
ci/circleci: test 3.7 Your tests passed on CircleCI!
Details
cla-bot Everyone involved has signed the CLA
codecov/patch 100% of diff hit (target 93.83%)
Details
codecov/project 93.84% (target 90%)
Details

@ghost ghost removed the in progress label Apr 5, 2019

balloob added a commit that referenced this pull request Apr 5, 2019

@balloob balloob referenced this pull request Apr 5, 2019

Merged

0.91.1 #22755

unibeck pushed a commit to unibeck/home-assistant that referenced this pull request Apr 7, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.