Attachment #192878 for bug #227745

Lines 3-9 Link Here

(-)www/iridium/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= iridium	4	PORTNAME= iridium
5	PORTVERSION= 58.0	5	PORTVERSION= 58.0
6	PORTREVISION= 13	6	PORTREVISION= 14
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= https://downloads.iridiumbrowser.de/source/	8	MASTER_SITES= https://downloads.iridiumbrowser.de/source/
9	PKGNAMESUFFIX= -browser	9	PKGNAMESUFFIX= -browser

Line 0 Link Here

(-)www/iridium/files/patch-media_base_decoder__buffer.h (+11 lines)
	1	--- media/base/decoder_buffer.h.orig 2018-04-28 17:47:57.057477000 +0200
	2	+++ media/base/decoder_buffer.h 2018-04-28 17:48:11.847624000 +0200
	3	@@ -37,7 +37,7 @@
	4	: public base::RefCountedThreadSafe<DecoderBuffer> {
	5	public:
	6	enum {
	7	- kPaddingSize = 32,
	8	+ kPaddingSize = 64,
	9	#if defined(ARCH_CPU_ARM_FAMILY)
	10	kAlignmentSize = 16
	11	#else




--- media/ffmpeg/ffmpeg_common.cc.orig	2018-04-28 17:44:34.207381000 +0200
+++ media/ffmpeg/ffmpeg_common.cc	2018-04-28 17:46:24.946243000 +0200
@@ -33,7 +33,7 @@
 // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
 // padded. Check here to ensure FFmpeg only receives data padded to its
 // specifications.
-static_assert(DecoderBuffer::kPaddingSize >= FF_INPUT_BUFFER_PADDING_SIZE,
+static_assert(DecoderBuffer::kPaddingSize >= AV_INPUT_BUFFER_PADDING_SIZE,
               "DecoderBuffer padding size does not fit ffmpeg requirement");
 
 // Alignment requirement by FFmpeg for input and output buffers. This need to
@@ -429,11 +429,11 @@
   } else {
     codec_context->extradata_size = config.extra_data().size();
     codec_context->extradata = reinterpret_cast<uint8_t*>(
-        av_malloc(config.extra_data().size() + FF_INPUT_BUFFER_PADDING_SIZE));
+        av_malloc(config.extra_data().size() + AV_INPUT_BUFFER_PADDING_SIZE));
     memcpy(codec_context->extradata, &config.extra_data()[0],
            config.extra_data().size());
     memset(codec_context->extradata + config.extra_data().size(), '\0',
-           FF_INPUT_BUFFER_PADDING_SIZE);
+           AV_INPUT_BUFFER_PADDING_SIZE);
   }
 }
 
@@ -561,11 +561,11 @@
   } else {
     codec_context->extradata_size = config.extra_data().size();
     codec_context->extradata = reinterpret_cast<uint8_t*>(
-        av_malloc(config.extra_data().size() + FF_INPUT_BUFFER_PADDING_SIZE));
+        av_malloc(config.extra_data().size() + AV_INPUT_BUFFER_PADDING_SIZE));
     memcpy(codec_context->extradata, &config.extra_data()[0],
            config.extra_data().size());
     memset(codec_context->extradata + config.extra_data().size(), '\0',
-           FF_INPUT_BUFFER_PADDING_SIZE);
+           AV_INPUT_BUFFER_PADDING_SIZE);
   }
 }
 

Line 0 Link Here

(-)www/iridium/files/patch-media_filters_ffmpeg__audio__decodec.cc (+11 lines)
	1	--- media/filters/ffmpeg_audio_decoder.cc.orig 2018-04-28 14:12:22.084504000 +0200
	2	+++ media/filters/ffmpeg_audio_decoder.cc 2018-04-28 14:14:19.735316000 +0200
	3	@@ -53,7 +53,7 @@
	4	// AVCodecContext.opaque to get the object reference in order to call
	5	// GetAudioBuffer() to do the actual allocation.
	6	static int GetAudioBuffer(struct AVCodecContext* s, AVFrame* frame, int flags) {
	7	- DCHECK(s->codec->capabilities & CODEC_CAP_DR1);
	8	+ DCHECK(s->codec->capabilities & AV_CODEC_CAP_DR1);
	9	DCHECK_EQ(s->codec_type, AVMEDIA_TYPE_AUDIO);
	10
	11	// Since this routine is called by FFmpeg when a buffer is required for audio




--- media/filters/ffmpeg_video_decoder.cc.orig	2018-04-28 14:12:48.579561000 +0200
+++ media/filters/ffmpeg_video_decoder.cc	2018-04-28 14:16:02.028730000 +0200
@@ -417,12 +417,11 @@
   codec_context_->thread_type =
       FF_THREAD_SLICE | (low_delay ? 0 : FF_THREAD_FRAME);
   codec_context_->opaque = this;
-  codec_context_->flags |= CODEC_FLAG_EMU_EDGE;
   codec_context_->get_buffer2 = GetVideoBufferImpl;
   codec_context_->refcounted_frames = 1;
 
   if (decode_nalus_)
-    codec_context_->flags2 |= CODEC_FLAG2_CHUNKS;
+    codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS;
 
   AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
   if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {

Return to bug 227745

Line 0 Link Here

(-)www/iridium/files/patch-media_ffmpeg_ffmpeg__common.cc (+39 lines)
	1	--- media/ffmpeg/ffmpeg_common.cc.orig 2018-04-28 17:44:34.207381000 +0200
	2	+++ media/ffmpeg/ffmpeg_common.cc 2018-04-28 17:46:24.946243000 +0200
	3	@@ -33,7 +33,7 @@
	4	// Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
	5	// padded. Check here to ensure FFmpeg only receives data padded to its
	6	// specifications.
	7	-static_assert(DecoderBuffer::kPaddingSize >= FF_INPUT_BUFFER_PADDING_SIZE,
	8	+static_assert(DecoderBuffer::kPaddingSize >= AV_INPUT_BUFFER_PADDING_SIZE,
	9	"DecoderBuffer padding size does not fit ffmpeg requirement");
	10
	11	// Alignment requirement by FFmpeg for input and output buffers. This need to
	12	@@ -429,11 +429,11 @@
	13	} else {
	14	codec_context->extradata_size = config.extra_data().size();
	15	codec_context->extradata = reinterpret_cast<uint8_t*>(
	16	- av_malloc(config.extra_data().size() + FF_INPUT_BUFFER_PADDING_SIZE));
	17	+ av_malloc(config.extra_data().size() + AV_INPUT_BUFFER_PADDING_SIZE));
	18	memcpy(codec_context->extradata, &config.extra_data()[0],
	19	config.extra_data().size());
	20	memset(codec_context->extradata + config.extra_data().size(), '\0',
	21	- FF_INPUT_BUFFER_PADDING_SIZE);
	22	+ AV_INPUT_BUFFER_PADDING_SIZE);
	23	}
	24	}
	25
	26	@@ -561,11 +561,11 @@
	27	} else {
	28	codec_context->extradata_size = config.extra_data().size();
	29	codec_context->extradata = reinterpret_cast<uint8_t*>(
	30	- av_malloc(config.extra_data().size() + FF_INPUT_BUFFER_PADDING_SIZE));
	31	+ av_malloc(config.extra_data().size() + AV_INPUT_BUFFER_PADDING_SIZE));
	32	memcpy(codec_context->extradata, &config.extra_data()[0],
	33	config.extra_data().size());
	34	memset(codec_context->extradata + config.extra_data().size(), '\0',
	35	- FF_INPUT_BUFFER_PADDING_SIZE);
	36	+ AV_INPUT_BUFFER_PADDING_SIZE);
	37	}
	38	}
	39

Line 0 Link Here

(-)www/iridium/files/patch-media_filters_ffmpeg__video__decodec.cc (+16 lines)
	1	--- media/filters/ffmpeg_video_decoder.cc.orig 2018-04-28 14:12:48.579561000 +0200
	2	+++ media/filters/ffmpeg_video_decoder.cc 2018-04-28 14:16:02.028730000 +0200
	3	@@ -417,12 +417,11 @@
	4	codec_context_->thread_type =
	5	FF_THREAD_SLICE \| (low_delay ? 0 : FF_THREAD_FRAME);
	6	codec_context_->opaque = this;
	7	- codec_context_->flags \|= CODEC_FLAG_EMU_EDGE;
	8	codec_context_->get_buffer2 = GetVideoBufferImpl;
	9	codec_context_->refcounted_frames = 1;
	10
	11	if (decode_nalus_)
	12	- codec_context_->flags2 \|= CODEC_FLAG2_CHUNKS;
	13	+ codec_context_->flags2 \|= AV_CODEC_FLAG2_CHUNKS;
	14
	15	AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
	16	if (!codec \|\| avcodec_open2(codec_context_.get(), codec, NULL) < 0) {