Attachment 179156 Details for Bug 215271 – patch-chromium-use-system-ffmpeg

[patch] patch-chromium-use-system-ffmpeg

patch-chromium-system-ffmpeg.diff (text/plain), 7.97 KB, created by Carlos J. Puga Medina on 2017-01-20 18:38:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J. Puga Medina

Created: 2017-01-20 18:38:57 UTC

Size: 7.97 KB

patch

obsolete

>Index: www/chromium/Makefile
>===================================================================
>--- www/chromium/Makefile	(revision 431976)
>+++ www/chromium/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	chromium
> PORTVERSION=	55.0.2883.87
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
>@@ -15,10 +16,12 @@
> 
> BUILD_DEPENDS=	bash:shells/bash \
> 		clang39:devel/llvm39 \
>+		ffmpeg>=3.2.2,1:multimedia/ffmpeg \
> 		python:lang/python \
> 		flock:sysutils/flock \
> 		gperf:devel/gperf \
> 		yasm:devel/yasm \
>+		${LOCALBASE}/include/libav/libavformat/internal.h:multimedia/libav \
> 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
> 		${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
> 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
>@@ -25,7 +28,8 @@
> 		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
> 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
> 
>-LIB_DEPENDS=	libcairo.so:graphics/cairo \
>+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
>+		libcairo.so:graphics/cairo \
> 		libcups.so:print/cups \
> 		libdbus-1.so:devel/dbus \
> 		libdbus-glib-1.so:devel/dbus-glib \
>@@ -224,7 +228,7 @@
> 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
> 	cd ${WRKSRC} && ${PYTHON_CMD} \
> 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
>-		flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE}
>+		ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE}
> 
> do-configure:
> 	# GN generator bootstrapping and generating ninja files
>Index: www/chromium/files/patch-media_ffmpeg__ffmpeg_common.h
>===================================================================
>--- www/chromium/files/patch-media_ffmpeg__ffmpeg_common.h	(nonexistent)
>+++ www/chromium/files/patch-media_ffmpeg__ffmpeg_common.h	(working copy)
>@@ -0,0 +1,19 @@
>+--- media/ffmpeg/ffmpeg_common.h.orig	2017-01-20 16:39:21.594594000 +0000
>++++ media/ffmpeg/ffmpeg_common.h	2017-01-20 16:40:36.609384000 +0000
>+@@ -25,7 +25,7 @@
>+ // Disable deprecated features which result in spammy compile warnings.  This
>+ // list of defines must mirror those in the 'defines' section of FFmpeg's
>+ // BUILD.gn file or the headers below will generate different structures!
>+-#define FF_API_CONVERGENCE_DURATION 0
>++//#define FF_API_CONVERGENCE_DURATION 0
>+ // Upstream libavcodec/utils.c still uses the deprecated
>+ // av_dup_packet(), causing deprecation warnings.
>+ // The normal fix for such things is to disable the feature as below,
>+@@ -39,7 +39,6 @@
>+ MSVC_PUSH_DISABLE_WARNING(4244);
>+ #include <libavcodec/avcodec.h>
>+ #include <libavformat/avformat.h>
>+-#include <libavformat/internal.h>
>+ #include <libavformat/avio.h>
>+ #include <libavutil/avutil.h>
>+ #include <libavutil/imgutils.h>
>
>Property changes on: www/chromium/files/patch-media_ffmpeg__ffmpeg_common.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/chromium/files/patch-media_filters__ffmpeg_demuxer.cc
>===================================================================
>--- www/chromium/files/patch-media_filters__ffmpeg_demuxer.cc	(nonexistent)
>+++ www/chromium/files/patch-media_filters__ffmpeg_demuxer.cc	(working copy)
>@@ -0,0 +1,27 @@
>+--- media/filters/ffmpeg_demuxer.cc.orig	2017-01-20 16:41:01.338620000 +0000
>++++ media/filters/ffmpeg_demuxer.cc	2017-01-20 16:45:09.946039000 +0000
>+@@ -1186,24 +1186,6 @@
>+   // If no estimate is found, the stream entry will be kInfiniteDuration.
>+   std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
>+                                                     kInfiniteDuration);
>+-  const AVFormatInternal* internal = format_context->internal;
>+-  if (internal && internal->packet_buffer &&
>+-      format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
>+-    struct AVPacketList* packet_buffer = internal->packet_buffer;
>+-    while (packet_buffer != internal->packet_buffer_end) {
>+-      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
>+-                start_time_estimates.size());
>+-      const AVStream* stream =
>+-          format_context->streams[packet_buffer->pkt.stream_index];
>+-      if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
>+-        const base::TimeDelta packet_pts =
>+-            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
>+-        if (packet_pts < start_time_estimates[stream->index])
>+-          start_time_estimates[stream->index] = packet_pts;
>+-      }
>+-      packet_buffer = packet_buffer->next;
>+-    }
>+-  }
>+ 
>+   std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
>+ 
>
>Property changes on: www/chromium/files/patch-media_filters__ffmpeg_demuxer.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264__h264_decoder_impl.cc
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264__h264_decoder_impl.cc	(nonexistent)
>+++ www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264__h264_decoder_impl.cc	(working copy)
>@@ -0,0 +1,15 @@
>+--- third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.orig	2017-01-20 16:46:55.707062000 +0000
>++++ third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc	2017-01-20 16:47:50.777686000 +0000
>+@@ -15,9 +15,9 @@
>+ #include <limits>
>+ 
>+ extern "C" {
>+-#include "third_party/ffmpeg/libavcodec/avcodec.h"
>+-#include "third_party/ffmpeg/libavformat/avformat.h"
>+-#include "third_party/ffmpeg/libavutil/imgutils.h"
>++#include <libavcodec/avcodec.h>
>++#include <libavformat/avformat.h>
>++#include <libavutil/imgutils.h>
>+ }  // extern "C"
>+ 
>+ #include "webrtc/base/checks.h"
>
>Property changes on: www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264__h264_decoder_impl.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264__h264_decoder_impl.h
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264__h264_decoder_impl.h	(nonexistent)
>+++ www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264__h264_decoder_impl.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.orig	2017-01-20 16:47:06.507060000 +0000
>++++ third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h	2017-01-20 16:48:08.025635000 +0000
>+@@ -17,7 +17,7 @@
>+ #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
>+ 
>+ extern "C" {
>+-#include "third_party/ffmpeg/libavcodec/avcodec.h"
>++#include <libavcodec/avcodec.h>
>+ }  // extern "C"
>+ 
>+ #include "webrtc/common_video/include/i420_buffer_pool.h"
>
>Property changes on: www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264__h264_decoder_impl.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 215271: 179156 | 179157 | 179266 | 179269 | 179318