Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Unified Diff: chromium/patches/to_upstream/55_h264_nal.patch

Issue 9370003: Remove pthreads patch, roll in new patches, disable unchecked bit readers. (Closed) Base URL: ssh://gerrit.chromium.org:29418/chromium/third_party/ffmpeg.git@master
Patch Set: gyp fix. Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromium/patches/to_upstream/55_h264_nal.patch
diff --git a/chromium/patches/to_upstream/55_h264_nal.patch b/chromium/patches/to_upstream/55_h264_nal.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d46449344e58bca1dca3b12b82cb4d5fd022748f
--- /dev/null
+++ b/chromium/patches/to_upstream/55_h264_nal.patch
@@ -0,0 +1,67 @@
+diff -wurp -N orig/libavcodec/h264.c ffmpeg/libavcodec/h264.c
+--- orig/libavcodec/h264.c 2012-02-06 14:02:09.990431439 -0800
++++ ffmpeg/libavcodec/h264.c 2012-02-06 14:06:11.752827405 -0800
+@@ -988,12 +988,13 @@ int ff_h264_decode_extradata(H264Context
+ AVCodecContext *avctx = h->s.avctx;
+
+ if(avctx->extradata[0] == 1){
+- int i, cnt, nalsize;
++ int i, cnt, nalsize, size_left;
+ unsigned char *p = avctx->extradata;
++ size_left = avctx->extradata_size;
+
+ h->is_avc = 1;
+
+- if(avctx->extradata_size < 7) {
++ if(size_left < 7) {
+ av_log(avctx, AV_LOG_ERROR, "avcC too short\n");
+ return -1;
+ }
+@@ -1003,23 +1004,47 @@ int ff_h264_decode_extradata(H264Context
+ // Decode sps from avcC
+ cnt = *(p+5) & 0x1f; // Number of sps
+ p += 6;
++ size_left -= 6;
+ for (i = 0; i < cnt; i++) {
++ if (size_left < 2) {
++ av_log(avctx, AV_LOG_ERROR, "Cannot read sps nalsize\n");
++ return -1;
++ }
+ nalsize = AV_RB16(p) + 2;
++ if (size_left < nalsize) {
++ av_log(avctx, AV_LOG_ERROR, "sps nalsize too big\n");
++ return -1;
++ }
+ if(decode_nal_units(h, p, nalsize) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i);
+ return -1;
+ }
+ p += nalsize;
++ size_left -= nalsize;
+ }
+ // Decode pps from avcC
++ if(!size_left) {
++ av_log(avctx, AV_LOG_ERROR, "Cannot read pps count\n");
++ return -1;
++ }
+ cnt = *(p++); // Number of pps
++ --size_left;
+ for (i = 0; i < cnt; i++) {
++ if (size_left < 2) {
++ av_log(avctx, AV_LOG_ERROR, "Cannot read pps nalsize\n");
++ return -1;
++ }
+ nalsize = AV_RB16(p) + 2;
++ if (size_left < nalsize) {
++ av_log(avctx, AV_LOG_ERROR, "pps nalsize too big\n");
++ return -1;
++ }
+ if (decode_nal_units(h, p, nalsize) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i);
+ return -1;
+ }
+ p += nalsize;
++ size_left -= nalsize;
+ }
+ // Now store right nal length size, that will be use to parse all other nals
+ h->nal_length_size = (avctx->extradata[4] & 0x03) + 1;

Powered by Google App Engine
This is Rietveld 408576698