[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.9.2-2-6-g0764f1f
Patrick Matthäi
pmatthaei at moszumanska.debian.org
Wed Oct 8 14:06:36 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/mlt.git;a=commitdiff;h=6bab17e
The following commit has been merged in the master branch:
commit 6bab17e24908666d9a38af34e26a15eb1647e289
Author: Patrick Matthäi <pmatthaei at debian.org>
Date: Wed Oct 8 15:48:57 2014 +0200
- Remove upstream patch 02-audio-rendering-libav0.11.
---
debian/changelog | 1 +
debian/patches/02-audio-rendering-libav0.11.diff | 110 -----------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 111 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c5e4261..5d9c81c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mlt (0.9.2+git20141008-1) UNRELEASED; urgency=low
* New upstream git snapshot.
+ - Remove upstream patch 02-audio-rendering-libav0.11.
-- Patrick Matthäi <pmatthaei at debian.org> Wed, 08 Oct 2014 15:47:22 +0200
diff --git a/debian/patches/02-audio-rendering-libav0.11.diff b/debian/patches/02-audio-rendering-libav0.11.diff
deleted file mode 100644
index ea64766..0000000
--- a/debian/patches/02-audio-rendering-libav0.11.diff
+++ /dev/null
@@ -1,110 +0,0 @@
-# Upstream patch to fix audio encoding with current libav versions.
-# URL: https://github.com/mltframework/mlt/commit/3ac0201b2526e2d11280005f67a63979fb5c783c
-# Closes: #761593
-
-diff -Naur mlt-0.9.2.orig/src/modules/avformat/consumer_avformat.c mlt-0.9.2/src/modules/avformat/consumer_avformat.c
---- mlt-0.9.2.orig/src/modules/avformat/consumer_avformat.c 2014-09-24 18:44:52.000000000 +0200
-+++ mlt-0.9.2/src/modules/avformat/consumer_avformat.c 2014-09-24 18:50:32.474014332 +0200
-@@ -1232,12 +1232,15 @@
- char key[27];
- mlt_properties frame_meta_properties = mlt_properties_new();
- int error_count = 0;
-- int64_t synth_audio_pts = 0;
-+ int64_t sample_count[ MAX_AUDIO_STREAMS ];
-
- // Initialize audio_st
- int i = MAX_AUDIO_STREAMS;
- while ( i-- )
-+ {
- audio_st[i] = NULL;
-+ sample_count[i] = 0;
-+ }
-
- // Check for user selected format first
- if ( format != NULL )
-@@ -1657,9 +1660,8 @@
- #if LIBAVCODEC_VERSION_MAJOR >= 54
- audio_avframe->nb_samples = FFMAX( samples, audio_input_nb_samples );
- #if LIBAVCODEC_VERSION_MAJOR >= 55
-- if ( audio_codec_id == AV_CODEC_ID_VORBIS )
-- audio_avframe->pts = synth_audio_pts;
-- synth_audio_pts += audio_avframe->nb_samples;
-+ audio_avframe->pts = sample_count[i];
-+ sample_count[i] += audio_avframe->nb_samples;
- #endif
- avcodec_fill_audio_frame( audio_avframe, codec->channels, codec->sample_fmt,
- (const uint8_t*) p, AUDIO_ENCODE_BUFFER_SIZE, 0 );
-@@ -1749,9 +1751,8 @@
- #if LIBAVCODEC_VERSION_MAJOR >= 54
- audio_avframe->nb_samples = FFMAX( samples, audio_input_nb_samples );
- #if LIBAVCODEC_VERSION_MAJOR >= 55
-- if ( audio_codec_id == AV_CODEC_ID_VORBIS )
-- audio_avframe->pts = synth_audio_pts;
-- synth_audio_pts += audio_avframe->nb_samples;
-+ audio_avframe->pts = sample_count[i];
-+ sample_count[i] += audio_avframe->nb_samples;
- #endif
- avcodec_fill_audio_frame( audio_avframe, codec->channels, codec->sample_fmt,
- (const uint8_t*) audio_buf_2, AUDIO_ENCODE_BUFFER_SIZE, 0 );
-@@ -1788,8 +1789,8 @@
- goto on_fatal_error;
- }
- error_count = 0;
-- mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "audio stream %d pkt pts %"PRId64" frame_size %d stream pts %"PRId64"
",
-- stream->index, pkt.pts, codec->frame_size, stream->pts.val );
-+ mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "audio stream %d pkt pts %"PRId64" frame_size %d
",
-+ stream->index, pkt.pts, codec->frame_size );
- }
- else if ( pkt.size < 0 )
- {
-@@ -1800,7 +1801,7 @@
-
- if ( i == 0 )
- {
-- audio_pts = (double)stream->pts.val * av_q2d( stream->time_base );
-+ audio_pts = (double) sample_count[0] * av_q2d( stream->time_base );
- }
- }
- }
-@@ -1974,7 +1975,6 @@
- // write the compressed frame in the media file
- ret = av_interleaved_write_frame(oc, &pkt);
- mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), " frame_size %d
", c->frame_size );
-- video_pts = (double)video_st->pts.val * av_q2d( video_st->time_base );
-
- // Dual pass logging
- if ( mlt_properties_get_data( properties, "_logfile", NULL ) && c->stats_out )
-@@ -1990,7 +1990,8 @@
- ret = 0;
- }
- }
-- frame_count++;
-+ frame_count++;
-+ video_pts = (double) frame_count * av_q2d( video_st->time_base );
- if ( ret )
- {
- mlt_log_fatal( MLT_CONSUMER_SERVICE( consumer ), "error writing video frame
" );
-@@ -2006,9 +2007,9 @@
- }
- }
- if ( audio_st[0] )
-- mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "audio pts %"PRId64" (%f) ", audio_st[0]->pts.val, audio_pts );
-+ mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "audio pts %f ", audio_pts );
- if ( video_st )
-- mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "video pts %"PRId64" (%f) ", video_st->pts.val, video_pts );
-+ mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "video pts %f ", video_pts );
- mlt_log_debug( MLT_CONSUMER_SERVICE( consumer ), "
" );
- }
-
-@@ -2062,9 +2063,8 @@
- pkt.size = audio_outbuf_size;
- audio_avframe->nb_samples = FFMAX( samples / channels, audio_input_nb_samples );
- #if LIBAVCODEC_VERSION_MAJOR >= 55
-- if ( audio_codec_id == AV_CODEC_ID_VORBIS )
-- audio_avframe->pts = synth_audio_pts;
-- synth_audio_pts += audio_avframe->nb_samples;
-+ audio_avframe->pts = sample_count[0];
-+ sample_count[0] += audio_avframe->nb_samples;
- #endif
- avcodec_fill_audio_frame( audio_avframe, c->channels, c->sample_fmt,
- (const uint8_t*) p, AUDIO_ENCODE_BUFFER_SIZE, 0 );
diff --git a/debian/patches/series b/debian/patches/series
index 882fdb2..75a74c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
01-changed-preset-path.diff
-02-audio-rendering-libav0.11.diff
03-encoding-libavformatv56.diff
04-deprecation-avstream.codec.time_base-muxer.diff
--
MLT multimedia framework packaging
More information about the pkg-kde-commits
mailing list