[FFmpeg-cvslog] avfilter/vf_waveform: add forgotten color and acolor filter to switch case
ffmpeg | branch: master | Paul B Mahol | Tue Mar 15 09:15:03
2016 +0100| [a68d4bf2356b70a1cc5035822ee35d5499437ab2] | committer: Paul B Mahol
avfilter/vf_waveform: add forgotten color and acolor filter to switch case
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a68d4bf2356b70a1cc5035822ee35d5499437ab2
---
libavfilter/vf_waveform.c |2 ++
1 file changed, 2 insertions(+)
diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c
index f5a6663..58cf0bb 100644
--- a/libavfilter/vf_waveform.c
+++ b/libavfilter/vf_waveform.c
@@ -2363,6 +2363,8 @@ static int config_input(AVFilterLink *inlink)
}
switch (s->filter) {
+case COLOR:
+case ACOLOR:
case LOWPASS:
switch (s->scale) {
case DIGITAL:
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc/mediacodec: remove stray empty lines
ffmpeg | branch: master | Matthieu Bouron | Mon
Mar 14 19:41:53 2016 +0100| [03a6ed83b029588c0927594b88f4cb0a254348c8] |
committer: Matthieu Bouron
lavc/mediacodec: remove stray empty lines
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03a6ed83b029588c0927594b88f4cb0a254348c8
---
libavcodec/mediacodec_wrapper.c |7 ---
libavcodec/mediacodecdec.c |1 -
2 files changed, 8 deletions(-)
diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c
index 3f8db64..6b3f905 100644
--- a/libavcodec/mediacodec_wrapper.c
+++ b/libavcodec/mediacodec_wrapper.c
@@ -398,7 +398,6 @@ fail:
return NULL;
}
-
int ff_AMediaFormat_delete(FFAMediaFormat* format)
{
int ret = 0;
@@ -658,7 +657,6 @@ fail:
return ret;
}
-
void ff_AMediaFormat_setInt32(FFAMediaFormat* format, const char* name,
int32_t value)
{
int attached = 0;
@@ -913,7 +911,6 @@ static const struct FFJniField jni_amediacodec_mapping[] = {
{ "android/media/MediaCodec", "getInputBuffer",
"(I)Ljava/nio/ByteBuffer;", FF_JNI_METHOD, offsetof(struct
JNIAMediaCodecFields, get_input_buffer_id), 0 },
{ "android/media/MediaCodec", "getInputBuffers",
"()[Ljava/nio/ByteBuffer;", FF_JNI_METHOD, offsetof(struct
JNIAMediaCodecFields, get_input_buffers_id), 1 },
-
{ "android/media/MediaCodec", "dequeueOutputBuffer",
"(Landroid/media/MediaCodec$BufferInfo;J)I", FF_JNI_METHOD, offsetof(struct
JNIAMediaCodecFields, dequeue_output_buffer_id), 1 },
{ "android/media/MediaCodec", "getOutputBuffer",
"(I)Ljava/nio/ByteBuffer;", FF_JNI_METHOD, offsetof(struct
JNIAMediaCodecFields, get_output_buffer_id), 0 },
{ "android/media/MediaCodec", "getOutputBuffers",
"()[Ljava/nio/ByteBuffer;", FF_JNI_METHOD, offsetof(struct
JNIAMediaCodecFields, get_output_buffers_id), 1 },
@@ -931,7 +928,6 @@ static const struct FFJniField jni_amediacodec_mapping[] = {
{ NULL }
};
-
static const AVClass amediacodec_class = {
.class_name = "amediacodec",
.item_name = av_default_item_name,
@@ -1252,7 +1248,6 @@ fail:
return NULL;
}
-
int ff_AMediaCodec_delete(FFAMediaCodec* codec)
{
int ret = 0;
@@ -1388,7 +1383,6 @@ fail:
return ret;
}
-
int ff_AMediaCodec_releaseOutputBuffer(FFAMediaCodec* codec, size_t idx, int
render)
{
int ret = 0;
@@ -1429,7 +1423,6 @@ fail:
return ret;
}
-
ssize_t ff_AMediaCodec_dequeueInputBuffer(FFAMediaCodec* codec, int64_t
timeoutUs)
{
int ret = 0;
diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c
index 41b009a..d385651 100644
--- a/libavcodec/mediacodecdec.c
+++ b/libavcodec/mediacodecdec.c
@@ -389,7 +389,6 @@ int ff_mediacodec_dec_decode(AVCodecContext *avctx,
MediaCodecDecContext *s,
int64_t input_dequeue_timeout_us = INPUT_DEQUEUE_TIMEOUT_US;
int64_t output_dequeue_timeout_us = OUTPUT_DEQUEUE_TIMEOUT_US;
-
if (pkt->size == 0) {
need_flushing = 1;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc/mediacodec: fix codec_name leak
ffmpeg | branch: master | Matthieu Bouron | Mon
Mar 14 19:27:14 2016 +0100| [31fe3c4d23aab8b43614b1ea825603080775677e] |
committer: Matthieu Bouron
lavc/mediacodec: fix codec_name leak
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31fe3c4d23aab8b43614b1ea825603080775677e
---
libavcodec/mediacodecdec.c |2 ++
libavcodec/mediacodecdec.h |2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c
index bd10ff7..41b009a 100644
--- a/libavcodec/mediacodecdec.c
+++ b/libavcodec/mediacodecdec.c
@@ -566,5 +566,7 @@ int ff_mediacodec_dec_close(AVCodecContext *avctx,
MediaCodecDecContext *s)
s->format = NULL;
}
+av_freep(&s->codec_name);
+
return 0;
}
diff --git a/libavcodec/mediacodecdec.h b/libavcodec/mediacodecdec.h
index bf23f85..36fdbf5 100644
--- a/libavcodec/mediacodecdec.h
+++ b/libavcodec/mediacodecdec.h
@@ -34,7 +34,7 @@
typedef struct MediaCodecDecContext {
-const char *codec_name;
+char *codec_name;
FFAMediaCodec *codec;
FFAMediaFormat *format;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/mediacodec_sw_buffer: remove redundant article
ffmpeg | branch: master | Michael Niedermayer | Tue Mar 15 03:20:17 2016 +0100| [7eedad946c30e36b06e476f5686c4ccb7de6dd06] | committer: Michael Niedermayer avcodec/mediacodec_sw_buffer: remove redundant article Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7eedad946c30e36b06e476f5686c4ccb7de6dd06 --- libavcodec/mediacodec_sw_buffer.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mediacodec_sw_buffer.c b/libavcodec/mediacodec_sw_buffer.c index 349a68d..7baf120 100644 --- a/libavcodec/mediacodec_sw_buffer.c +++ b/libavcodec/mediacodec_sw_buffer.c @@ -37,7 +37,7 @@ #define QCOM_TILE_GROUP_SIZE (4 * QCOM_TILE_SIZE) /** - * The code handling the the various YUV color formats is taken from the + * The code handling the various YUV color formats is taken from the * GStreamer project. * * Gstreamer reference: ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavf/segment: add increment_tc option
ffmpeg | branch: master | Martin Vignali | Sun Feb
28 21:36:42 2016 +0100| [69638517d15912f5411cb5ebd0513c31beed2798] | committer:
Stefano Sabatini
lavf/segment: add increment_tc option
For example you can split a file, keeping a continuous timecode between
each segment:
ffmpeg -i src.mov -timecode 10:00:00:00 -vcodec copy -f segment \
-segment_time 2 -reset_timestamps 1 -increment_tc 1 target_%03d.mov
Signed-off-by: Stefano Sabatini
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69638517d15912f5411cb5ebd0513c31beed2798
---
doc/muxers.texi |6 ++
libavformat/segment.c | 32
libavformat/version.h |2 +-
3 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/doc/muxers.texi b/doc/muxers.texi
index ef7f333..c36c72c 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -1045,6 +1045,12 @@ implementation for HLS segmentation.
The segment muxer supports the following options:
@table @option
+@item increment_tc @var{1|0}
+if set to @code{1}, increment timecode between each segment
+If this is selected, the input need to have
+a timecode in the first video stream. Default value is
+@code{0}.
+
@item reference_stream @var{specifier}
Set the reference stream, as specified by the string @var{specifier}.
If @var{specifier} is set to @code{auto}, the reference is chosen
diff --git a/libavformat/segment.c b/libavformat/segment.c
index dd3b092..6335c89 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -41,6 +41,7 @@
#include "libavutil/parseutils.h"
#include "libavutil/mathematics.h"
#include "libavutil/time.h"
+#include "libavutil/timecode.h"
#include "libavutil/time_internal.h"
#include "libavutil/timestamp.h"
@@ -95,6 +96,7 @@ typedef struct SegmentContext {
char *time_str;///< segment duration specification string
int64_t time; ///< segment duration
int use_strftime; ///< flag to expand filename with strftime
+int increment_tc; ///< flag to increment timecode if found
char *times_str; ///< segment times specification string
int64_t *times;///< list of segment interval specification
@@ -337,6 +339,12 @@ static int segment_end(AVFormatContext *s, int
write_trailer, int is_last)
SegmentContext *seg = s->priv_data;
AVFormatContext *oc = seg->avf;
int ret = 0;
+AVTimecode tc;
+AVRational rate;
+AVDictionaryEntry *tcr;
+char buf[AV_TIMECODE_STR_SIZE];
+int i;
+int err;
av_write_frame(oc, NULL); /* Flush any buffered data (fragmented mp4) */
if (write_trailer)
@@ -390,6 +398,29 @@ static int segment_end(AVFormatContext *s, int
write_trailer, int is_last)
seg->avf->filename, seg->segment_count);
seg->segment_count++;
+if (seg->increment_tc) {
+tcr = av_dict_get(s->metadata, "timecode", NULL, 0);
+if (tcr) {
+/* search the first video stream */
+for (i = 0; i < s->nb_streams; i++) {
+if (s->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+rate = s->streams[i]->avg_frame_rate;/* Get fps from the
video stream */
+err = av_timecode_init_from_string(&tc, rate, tcr->value,
s);
+if (err < 0) {
+av_log(s, AV_LOG_WARNING, "Could not increment
timecode, error occured during timecode creation.");
+break;
+}
+tc.start += (int)((seg->cur_entry.end_time -
seg->cur_entry.start_time) * av_q2d(rate));/* increment timecode */
+av_dict_set(&s->metadata, "timecode",
+av_timecode_make_string(&tc, buf, 0), 0);
+break;
+}
+}
+} else {
+av_log(s, AV_LOG_WARNING, "Could not increment timecode, no
timecode metadata found");
+}
+}
+
end:
ff_format_io_close(oc, &oc->pb);
@@ -948,6 +979,7 @@ static const AVOption options[] = {
{ "segment_start_number", "set the sequence number of the first segment",
OFFSET(segment_idx), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E },
{ "segment_wrap_number", "set the number of wrap before the first
segment", OFFSET(segment_idx_wrap_nb), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX,
E },
{ "strftime", "set filename expansion with strftime at segment
creation", OFFSET(use_strftime), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E },
+{ "increment_tc", "increment timecode between each segment",
OFFSET(increment_tc), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, E },
{ "break_non_keyframes", "allow breaking segments on non-keyframes",
OFFSET(break_non_keyframes), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, E },
{ "individual_header_trailer", "write header/trailer to each segment",
OFFSET(individual_header_trailer), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, E },
diff --git a/libavformat/version.h b/libavformat/v
[FFmpeg-cvslog] lavf/segment: change type of increment_tc to BOOL
ffmpeg | branch: master | Stefano Sabatini | Tue Mar 15
17:50:00 2016 +0100| [7725210e715dc4121bcb6ae7b0aba6d8ccfb7c46] | committer:
Stefano Sabatini
lavf/segment: change type of increment_tc to BOOL
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7725210e715dc4121bcb6ae7b0aba6d8ccfb7c46
---
libavformat/segment.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 6335c89..ccedd04 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -979,7 +979,7 @@ static const AVOption options[] = {
{ "segment_start_number", "set the sequence number of the first segment",
OFFSET(segment_idx), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E },
{ "segment_wrap_number", "set the number of wrap before the first
segment", OFFSET(segment_idx_wrap_nb), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX,
E },
{ "strftime", "set filename expansion with strftime at segment
creation", OFFSET(use_strftime), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E },
-{ "increment_tc", "increment timecode between each segment",
OFFSET(increment_tc), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, E },
+{ "increment_tc", "increment timecode between each segment",
OFFSET(increment_tc), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E },
{ "break_non_keyframes", "allow breaking segments on non-keyframes",
OFFSET(break_non_keyframes), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, E },
{ "individual_header_trailer", "write header/trailer to each segment",
OFFSET(individual_header_trailer), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, E },
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. b5af634 web: News entry about GSoC2016
The branch, master has been updated via b5af63432925a84e7371ef1eb4883922bc42773a (commit) from dc0762811b87f6cac18ab56bc415b771bc868676 (commit) - Log - commit b5af63432925a84e7371ef1eb4883922bc42773a Author: Michael Niedermayer AuthorDate: Wed Mar 16 03:20:11 2016 +0100 Commit: Michael Niedermayer CommitDate: Wed Mar 16 03:21:33 2016 +0100 web: News entry about GSoC2016 Signed-off-by: Michael Niedermayer diff --git a/src/index b/src/index index f3e60ea..c469028 100644 --- a/src/index +++ b/src/index @@ -37,6 +37,14 @@ News + March 16th, 2016, Google Summer of Code + +FFmpeg has been accepted as a https://summerofcode.withgoogle.com/";>Google Summer of Code open source organization. If you wish to +participate as a student see our https://trac.ffmpeg.org/wiki/SponsoringPrograms/GSoC/2016";>project ideas page. +You can already get in contact with mentors and start working on qualification tasks as well as register at google and submit your project proposal draft. +Good luck! + + February 15th, 2016, FFmpeg 3.0 "Einstein" FFmpeg 3.0 "Einstein", a new --- Summary of changes: src/index | 8 1 file changed, 8 insertions(+) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/vf_bwdif: Add yadif base information to copyright header
ffmpeg | branch: master | Thomas Mundt | Tue Mar 15 16:04:20 2016 +0100| [d0a9114f991142514fe398ea2cc4ba58620691b1] | committer: James Almer avfilter/vf_bwdif: Add yadif base information to copyright header Signed-off-by: Thomas Mundt Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0a9114f991142514fe398ea2cc4ba58620691b1 --- libavfilter/x86/vf_bwdif.asm |4 1 file changed, 4 insertions(+) diff --git a/libavfilter/x86/vf_bwdif.asm b/libavfilter/x86/vf_bwdif.asm index 11aa025..147b7c6 100644 --- a/libavfilter/x86/vf_bwdif.asm +++ b/libavfilter/x86/vf_bwdif.asm @@ -3,6 +3,10 @@ ;* ;* Copyright (C) 2016 Thomas Mundt ;* +;* Based on yadif simd code +;* Copyright (C) 2006 Michael Niedermayer +;* 2013 Daniel Kang +;* ;* This file is part of FFmpeg. ;* ;* FFmpeg is free software; you can redistribute it and/or ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
