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.

Sign up for GitHub

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: Parse one frame mpeg-ts video #1015

Merged
merged 11 commits into from
Oct 28, 2022
Merged

fix: Parse one frame mpeg-ts video #1015

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9d7606c
fix: Parse one frame mpeg-ts video
zdanek Jan 4, 2022
b4e7fd3
Remove cruft from comment
joeyparrish Oct 27, 2022
63227b7
Fix indentation
joeyparrish Oct 27, 2022
a3867e2
Simplify READ_LONG_OR_RETURN in h265
joeyparrish Oct 27, 2022
346fb8d
Simplify READ_LONG_OR_RETURN in h264
joeyparrish Oct 27, 2022
86b8397
Fix h265_parser build
joeyparrish Oct 28, 2022
1bbcdb6
Fix h264 build
joeyparrish Oct 28, 2022
e2dd0a6
Fix h264 errors
joeyparrish Oct 28, 2022
bb1e8ad
Fix h265 error
joeyparrish Oct 28, 2022
5a89cbb
Fix h265 error maybe finally for real this time
joeyparrish Oct 28, 2022
6acf8a2
Update h265_parser.cc
joeyparrish Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix h265_parser build
  • Loading branch information
@joeyparrish
joeyparrish authored Oct 28, 2022
commit 86b839730da1816dfdca5bc3ac47565ba6202e95
6 changes: 4 additions & 2 deletions packager/media/codecs/h265_parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@

#define READ_BITS_OR_RETURN(num_bits, out) \
do { \
if (!br->ReadBits(num_bits, (out))) { \
int _tmp_out; \
if (!br->ReadBits(num_bits, &_tmp_out)) { \
DVLOG(1) \
<< "Error in stream: unexpected EOS while trying to read " #out; \
return kInvalidStream; \
} \
} while (0)
*(out) = _tmp_out; \
} while(0) \

#define READ_LONG_OR_RETURN(out) READ_BITS_OR_RETURN(32, out)

Expand Down