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

Unified Diff: chromium/patches/to_upstream/11a_compile_with_disabled_features.patch

Issue 9290059: Initial commit of all previous Chrome build scripts. (Closed) Base URL: http://git.chromium.org/chromium/third_party/ffmpeg.git@master
Patch Set: Drop deprecated subfolder. Created 8 years, 11 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/11a_compile_with_disabled_features.patch
diff --git a/chromium/patches/to_upstream/11a_compile_with_disabled_features.patch b/chromium/patches/to_upstream/11a_compile_with_disabled_features.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0d98d3c2426d16b7b9aaff8688361dd903012798
--- /dev/null
+++ b/chromium/patches/to_upstream/11a_compile_with_disabled_features.patch
@@ -0,0 +1,101 @@
+diff -wurp -N orig/libavformat/matroskadec.c ffmpeg/libavformat/matroskadec.c
+--- orig/libavformat/matroskadec.c 2011-07-12 20:48:14.532933135 -0700
++++ ffmpeg/libavformat/matroskadec.c 2011-07-12 20:48:14.583029843 -0700
+@@ -35,13 +35,17 @@
+ /* For ff_codec_get_id(). */
+ #include "riff.h"
+ #include "isom.h"
++#if CONFIG_SIPR_DECODER
+ #include "rm.h"
++#endif
+ #include "matroska.h"
+ #include "libavcodec/mpeg4audio.h"
+ #include "libavutil/intfloat_readwrite.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/avstring.h"
++#if HAVE_LZO1X_999_COMPRESS
+ #include "libavutil/lzo.h"
++#endif
+ #include "libavutil/dict.h"
+ #if CONFIG_ZLIB
+ #include <zlib.h>
+@@ -971,6 +980,7 @@ static int matroska_decode_buffer(uint8_
+ switch (encodings[0].compression.algo) {
+ case MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP:
+ return encodings[0].compression.settings.size;
++#if HAVE_LZO1X_999_COMPRESS
+ case MATROSKA_TRACK_ENCODING_COMP_LZO:
+ do {
+ olen = pkt_size *= 3;
+@@ -981,6 +991,7 @@ static int matroska_decode_buffer(uint8_
+ goto failed;
+ pkt_size -= olen;
+ break;
++#endif
+ #if CONFIG_ZLIB
+ case MATROSKA_TRACK_ENCODING_COMP_ZLIB: {
+ z_stream zstream = {0};
+@@ -1308,6 +1319,7 @@ static int matroska_read_header(AVFormat
+ "(EBML version %"PRIu64", doctype %s, doc version %"PRIu64")\n",
+ ebml.version, ebml.doctype, ebml.doctype_version);
+ }
++ av_metadata_set2(&s->metadata, "doctype", ebml.doctype, 0);
+ for (i = 0; i < FF_ARRAY_ELEMS(matroska_doctypes); i++)
+ if (!strcmp(ebml.doctype, matroska_doctypes[i]))
+ break;
+@@ -1370,14 +1382,17 @@ static int matroska_read_header(AVFormat
+ "Multiple combined encodings no supported");
+ } else if (encodings_list->nb_elem == 1) {
+ if (encodings[0].type ||
+- (encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP &&
++ (encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP
+ #if CONFIG_ZLIB
+- encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_ZLIB &&
++ && encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_ZLIB
+ #endif
+ #if CONFIG_BZLIB
+- encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_BZLIB &&
++ && encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_BZLIB
+ #endif
+- encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO)) {
++#if HAVE_LZO1X_999_COMPRESS
++ && encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO
++#endif
++ )) {
+ encodings[0].scope = 0;
+ av_log(matroska->ctx, AV_LOG_ERROR,
+ "Unsupported encoding type");
+@@ -1505,11 +1520,13 @@ static int matroska_read_header(AVFormat
+ st->codec->block_align = track->audio.coded_framesize;
+ track->codec_priv.size = 0;
+ } else {
++#if CONFIG_SIPR_DECODER
+ if (codec_id == CODEC_ID_SIPR && flavor < 4) {
+ const int sipr_bit_rate[4] = { 6504, 8496, 5000, 16000 };
+ track->audio.sub_packet_size = ff_sipr_subpk_size[flavor];
+ st->codec->bit_rate = sipr_bit_rate[flavor];
+ }
++#endif
+ st->codec->block_align = track->audio.sub_packet_size;
+ extradata_offset = 78;
+ }
+@@ -1593,6 +1610,8 @@ static int matroska_read_header(AVFormat
+ } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codec->sample_rate = track->audio.out_samplerate;
++ if (st->codec->sample_rate <= 0)
++ st->codec->sample_rate = 1;
+ st->codec->channels = track->audio.channels;
+ if (st->codec->codec_id != CODEC_ID_AAC)
+ st->need_parsing = AVSTREAM_PARSE_HEADERS;
+@@ -1853,8 +1872,10 @@ static int matroska_parse_block(Matroska
+ memcpy(track->audio.buf+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), data+x*sps, sps);
+
+ if (++track->audio.sub_packet_cnt >= h) {
++#if CONFIG_SIPR_DECODER
+ if (st->codec->codec_id == CODEC_ID_SIPR)
+ ff_rm_reorder_sipr_data(track->audio.buf, h, w);
++#endif
+ track->audio.sub_packet_cnt = 0;
+ track->audio.pkt_cnt = h*w / a;
+ }

Powered by Google App Engine
This is Rietveld 408576698