Fix h264 errors

shaka-project · Oct 28, 2022 · e2dd0a6 · e2dd0a6
1 parent 1bbcdb6
commit e2dd0a6
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/packager/media/codecs/h264_parser.cc b/packager/media/codecs/h264_parser.cc
@@ -112,16 +112,16 @@ bool H264SliceHeader::IsSISlice() const {
     }                                                                      \
   } while (0)
 
-#define READ_LONG_OR_RETURN(out)                                           \
-  do {                                                                     \
-    int _out;                                                              \
-    if (!br->ReadBits(32, &_out)) {                                        \
-      DVLOG(1)                                                             \
-          << "Error in stream: unexpected EOS while trying to read " #out; \
-      return kInvalidStream;                                               \
-    }                                                                      \
-    *(out) = _out != 0;                                                    \
-  } while (0)
+#define READ_LONG_OR_RETURN(out)        \
+  do {                                  \
+    long _out;                          \
+    int _tmp_out;                       \
+    READ_BITS_OR_RETURN(16, &_tmp_out); \
+    _out = (long)(_tmp_out) << 16;      \
+    READ_BITS_OR_RETURN(16, &_tmp_out); \
+    _out |= _tmp_out;                   \
+    *(out) = _out;                      \
+  } while(0)
 
 #define READ_BOOL_OR_RETURN(out)                                           \
   do {                                                                     \