svn commit: r468704 - in head/www/iridium: . files
Carlos J. Puga Medina
cpm at FreeBSD.org
Mon Apr 30 15:34:24 UTC 2018
Author: cpm
Date: Mon Apr 30 15:34:23 2018
New Revision: 468704
URL: https://svnweb.freebsd.org/changeset/ports/468704
Log:
www/iridium: unbreak with ffmpeg 4.0
PR: 227745
Reported by: jbeich
Added:
head/www/iridium/files/patch-media_base_decoder__buffer.h (contents, props changed)
head/www/iridium/files/patch-media_ffmpeg_ffmpeg__common.cc (contents, props changed)
head/www/iridium/files/patch-media_filters_ffmpeg__audio__decodec.cc (contents, props changed)
head/www/iridium/files/patch-media_filters_ffmpeg__video__decodec.cc (contents, props changed)
Modified:
head/www/iridium/Makefile
Modified: head/www/iridium/Makefile
==============================================================================
--- head/www/iridium/Makefile Mon Apr 30 13:42:14 2018 (r468703)
+++ head/www/iridium/Makefile Mon Apr 30 15:34:23 2018 (r468704)
@@ -3,7 +3,7 @@
PORTNAME= iridium
PORTVERSION= 58.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= www
MASTER_SITES= https://downloads.iridiumbrowser.de/source/
PKGNAMESUFFIX= -browser
Added: head/www/iridium/files/patch-media_base_decoder__buffer.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/iridium/files/patch-media_base_decoder__buffer.h Mon Apr 30 15:34:23 2018 (r468704)
@@ -0,0 +1,11 @@
+--- media/base/decoder_buffer.h.orig 2018-04-28 17:47:57.057477000 +0200
++++ media/base/decoder_buffer.h 2018-04-28 17:48:11.847624000 +0200
+@@ -37,7 +37,7 @@
+ : public base::RefCountedThreadSafe<DecoderBuffer> {
+ public:
+ enum {
+- kPaddingSize = 32,
++ kPaddingSize = 64,
+ #if defined(ARCH_CPU_ARM_FAMILY)
+ kAlignmentSize = 16
+ #else
Added: head/www/iridium/files/patch-media_ffmpeg_ffmpeg__common.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/iridium/files/patch-media_ffmpeg_ffmpeg__common.cc Mon Apr 30 15:34:23 2018 (r468704)
@@ -0,0 +1,39 @@
+--- 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);
+ }
+ }
+
Added: head/www/iridium/files/patch-media_filters_ffmpeg__audio__decodec.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/iridium/files/patch-media_filters_ffmpeg__audio__decodec.cc Mon Apr 30 15:34:23 2018 (r468704)
@@ -0,0 +1,11 @@
+--- media/filters/ffmpeg_audio_decoder.cc.orig 2018-04-28 14:12:22.084504000 +0200
++++ media/filters/ffmpeg_audio_decoder.cc 2018-04-28 14:14:19.735316000 +0200
+@@ -53,7 +53,7 @@
+ // AVCodecContext.opaque to get the object reference in order to call
+ // GetAudioBuffer() to do the actual allocation.
+ static int GetAudioBuffer(struct AVCodecContext* s, AVFrame* frame, int flags) {
+- DCHECK(s->codec->capabilities & CODEC_CAP_DR1);
++ DCHECK(s->codec->capabilities & AV_CODEC_CAP_DR1);
+ DCHECK_EQ(s->codec_type, AVMEDIA_TYPE_AUDIO);
+
+ // Since this routine is called by FFmpeg when a buffer is required for audio
Added: head/www/iridium/files/patch-media_filters_ffmpeg__video__decodec.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/iridium/files/patch-media_filters_ffmpeg__video__decodec.cc Mon Apr 30 15:34:23 2018 (r468704)
@@ -0,0 +1,16 @@
+--- 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) {
More information about the svn-ports-head
mailing list