Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4796 from Rmys/master

Browse Source 
qt5-webengine:rebuild
This commit is contained in:
Rmys
2018-04-26 21:15:38 +03:00
committed by GitHub
parent 06bc9aa783 f8c53c0f79
commit de69281375
2 changed files with 93 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-webengine/files/qtwebengine-ffmpeg4.patch
+85
View File
@@ -0,0 +1,85 @@
diff -Nuar a/src/3rdparty/chromium/media/base/decoder_buffer.h b/src/3rdparty/chromium/media/base/decoder_buffer.h
--- a/src/3rdparty/chromium/media/base/decoder_buffer.h 2017-11-08 22:13:31.000000000 +0300
+++ b/src/3rdparty/chromium/media/base/decoder_buffer.h 2018-04-26 15:52:44.678483902 +0300
@@ -37,7 +37,7 @@
: public base::RefCountedThreadSafe<DecoderBuffer> {
public:
enum {
- kPaddingSize = 32,
+ kPaddingSize = 64,
#if defined(ARCH_CPU_ARM_FAMILY)
kAlignmentSize = 16
#else
diff -Nuar a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc
--- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc 2017-11-08 22:13:31.000000000 +0300
+++ b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc 2018-04-26 15:56:51.217466113 +0300
@@ -30,10 +30,10 @@
} // namespace
-// Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
+// Why AV_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);
}
}
diff -Nuar a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
--- a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc 2017-11-08 22:13:31.000000000 +0300
+++ b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc 2018-04-26 15:58:11.213460341 +0300
@@ -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
diff -Nuar a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
--- a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc 2017-11-08 22:13:31.000000000 +0300
+++ b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc 2018-04-26 16:01:18.758446808 +0300
@@ -415,12 +415,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) {
desktop/toolkit/qt5/qt5-webengine/pspec.xml
+8 -1
View File
@@ -70,7 +70,7 @@
<Dependency>git</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">qtwebengine-5.7.0-icu58.patch</Patch> -->
<Patch level="1">qtwebengine-ffmpeg4.patch</Patch>
<Patch level="1">qtwebengine-5.9.3-icu-60-build.patch</Patch>
<Patch level="1">harmony-fix.diff</Patch>
</Patches>
@@ -157,6 +157,13 @@
</Package>
<History>
<Update release="5">
<Date>2018-04-25</Date>
<Version>5.9.3</Version>
<Comment>Release bump</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2018-03-01</Date>
<Version>5.9.3</Version>