Re: [FFmpeg-devel] [PATCH] aacdec_template: remove obsolete warning suppression
On Thu, Aug 13, 2015 at 08:57:12PM -0400, Ganesh Ajjanagadde wrote:
On Thu, Jul 30, 2015 at 4:06 PM, Ganesh Ajjanagadde
gajjanaga...@gmail.com wrote:
Signed-off-by: Ganesh Ajjanagadde gajjanaga...@gmail.com
---
libavcodec/aacdec_template.c | 5 -
1 file changed, 5 deletions(-)
diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index 2f270bc..d7849da 100644
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@@ -1907,11 +1907,6 @@ static int decode_ics(AACContext *ac,
SingleChannelElement *sce,
ac-oc[1].m4ac.object_type == AOT_ER_AAC_LD ||
ac-oc[1].m4ac.object_type == AOT_ER_AAC_ELD;
-/* This assignment is to silence a GCC warning about the variable
being used
- * uninitialized when in fact it always is.
- */
-pulse.num_pulse = 0;
-
global_gain = get_bits(gb, 8);
if (!common_window !scale_flag) {
--
2.5.0
I guess I should have clarified the intent of this patch:
This particular code only existed (as shown in the comment) to work
around a compiler bug regarding diagnostics.
Said compiler bug does not affect GCC of any recent vintage (I run the
latest 5.2, but tested 4.8.1),
many people and also developers still use older compilers
false positive warnings distract from real issues
do you know in which version of gcc this was fixed?
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
it is not once nor twice but times without number that the same ideas make
their appearance in the world. -- Aristotle
signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] doc/demuxers/mpegts: update documentation
On date Friday 2015-08-14 00:16:31 +0200, Michael Niedermayer encoded: On Thu, Aug 13, 2015 at 01:26:30PM +0200, Stefano Sabatini wrote: The description is yet crappy, it merely copies the description of the added and undocumented options and their value range. More descriptive documentation is welcome. --- doc/demuxers.texi | 19 +++ 1 file changed, 19 insertions(+) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index e45e1af..e4f5f8f 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -414,13 +414,32 @@ ffmpeg -framerate 10 -pattern_type glob -i *.png out.mkv MPEG-2 transport stream demuxer. +This demuxer accepts the following options: @table @option +@item resync_size +Set size limit for looking up a new synchronization. Default value is +65536. @item fix_teletext_pts Overrides teletext packet PTS and DTS values with the timestamps calculated from the PCR of the first program which the teletext stream is part of and is not discarded. Default value is 1, set this option to 0 if you want your teletext packet PTS and DTS values untouched. + +@item ts_packetsize +Output option carrying the raw packet size in bytes. +Show the detected raw packet size, cannot be set by the user. + +@item scan_all_pmts +Scan and combine all PMTs. The value is an integer with value from -1 +to 1, default value is -1. -1 - auto 1 - enabled 0-disabled +@item skip_changes +Skip changing / adding streams / programs when set to 1. +Default value is 0. + +@item skip_clear +Skip clearing programs if set to 1. Default value is 0. @end table these 2 are intended to be used internally by libavformat i guess applications could use them too but they are not marked as demuxer or muxer options and they arent in the help output presented to users Uhm, so I think I'll skip them. Thanks, updated. -- FFmpeg = Faithless and Fierce Multipurpose Power Exuberant Gymnast From 81cbdd00f9a2ce5a2a8ece6148315e4255ec Mon Sep 17 00:00:00 2001 From: Stefano Sabatini stefa...@gmail.com Date: Thu, 13 Aug 2015 13:19:20 +0200 Subject: [PATCH] doc/demuxers/mpegts: update documentation The description is yet crappy, it merely copies the description of the added and undocumented options and their value range. More descriptive documentation is welcome. --- doc/demuxers.texi | 13 + 1 file changed, 13 insertions(+) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index e45e1af..dc07b91 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -414,13 +414,26 @@ ffmpeg -framerate 10 -pattern_type glob -i *.png out.mkv MPEG-2 transport stream demuxer. +This demuxer accepts the following options: @table @option +@item resync_size +Set size limit for looking up a new synchronization. Default value is +65536. @item fix_teletext_pts Overrides teletext packet PTS and DTS values with the timestamps calculated from the PCR of the first program which the teletext stream is part of and is not discarded. Default value is 1, set this option to 0 if you want your teletext packet PTS and DTS values untouched. + +@item ts_packetsize +Output option carrying the raw packet size in bytes. +Show the detected raw packet size, cannot be set by the user. + +@item scan_all_pmts +Scan and combine all PMTs. The value is an integer with value from -1 +to 1 (-1 means automatic setting, 1 means enabled, 0 means +disabled). Default value is -1. @end table @section rawvideo -- 1.9.1 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] Changed max bitrate for VBV mode (according to Ivan Uskow)
-Ursprüngliche Nachricht-
Von: ffmpeg-devel [mailto:ffmpeg-devel-boun...@ffmpeg.org] Im Auftrag
von Michael Niedermayer
Gesendet: Freitag, 14. August 2015 10:32
An: FFmpeg development discussions and patches
Betreff: Re: [FFmpeg-devel] [PATCH] Changed max bitrate for VBV mode
(according to Ivan Uskow)
On Fri, Aug 14, 2015 at 07:37:08AM +0200, Sven Dueking wrote:
-Ursprüngliche Nachricht-
Von: ffmpeg-devel [mailto:ffmpeg-devel-boun...@ffmpeg.org] Im
Auftrag von Michael Niedermayer
Gesendet: Donnerstag, 13. August 2015 17:41
An: FFmpeg development discussions and patches
Cc: Sven Dueking
Betreff: Re: [FFmpeg-devel] [PATCH] Changed max bitrate for VBV
mode
(according to Ivan Uskow)
On Thu, Aug 13, 2015 at 11:30:45AM +0100, Sven Dueking wrote:
From: Sven Dueking s...@nablet.com
---
libavcodec/qsvenc.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index
57f5fe4..b56e4b4 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -118,10 +118,14 @@ static int init_video_param(AVCodecContext
*avctx, QSVEncContext *q)
switch (q-param.mfx.RateControlMethod) {
case MFX_RATECONTROL_CBR:
+ q-param.mfx.InitialDelayInKB = avctx-
rc_initial_buffer_occupancy / 1000;
+q-param.mfx.TargetKbps = avctx-bit_rate / 1000;
+q-param.mfx.MaxKbps = avctx-bit_rate / 1000;
+break;
case MFX_RATECONTROL_VBR:
q-param.mfx.InitialDelayInKB = avctx-
rc_initial_buffer_occupancy / 1000;
q-param.mfx.TargetKbps = avctx-bit_rate / 1000;
-q-param.mfx.MaxKbps = avctx-bit_rate / 1000;
+q-param.mfx.MaxKbps = avctx-rc_max_rate /
1000;
why is rc_max_rate not used for MFX_RATECONTROL_CBR ?
Hi Michael,
Ivan is on vacation and I did the fix according to his last command :
This correct for MFX_RATECONTROL_CBR but a bug for
MFX_RATECONTROL_VBR.
Will fixed later. For any case part of ratecontrol setup should be
re-designed to support more advanced LA rate contol
The Intel Documentation states that :
For variable bitrate control, the MaxKbps parameter specifies the
maximum bitrate at which the encoded data enters the Video Buffering
Verifier (VBV) buffer.
And for CBR the target bitrate and max bitrate should be equal to
archive a bitrate that is near a desired target for streaming (no
peaks etc.)
In the code there is this:
} else if (avctx-rc_max_rate == avctx-bit_rate) {
q-param.mfx.RateControlMethod = MFX_RATECONTROL_CBR;
ratecontrol_desc = constant bitrate (CBR);
assuming thats how CBR is set, the variables are equal and the special
case is not needed am i missing something ?
No, you are right. I missed that. So max_rate and bit_rate have the same
value.. means you can ignore my patch or keep it for readability.
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
The misfortune of the wise is better than the prosperity of the fool.
-- Epicurus
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] Changed max bitrate for VBV mode (according to Ivan Uskow)
On Fri, Aug 14, 2015 at 10:42:38AM +0200, Sven Dueking wrote:
-Ursprüngliche Nachricht-
Von: ffmpeg-devel [mailto:ffmpeg-devel-boun...@ffmpeg.org] Im Auftrag
von Michael Niedermayer
Gesendet: Freitag, 14. August 2015 10:32
An: FFmpeg development discussions and patches
Betreff: Re: [FFmpeg-devel] [PATCH] Changed max bitrate for VBV mode
(according to Ivan Uskow)
On Fri, Aug 14, 2015 at 07:37:08AM +0200, Sven Dueking wrote:
-Ursprüngliche Nachricht-
Von: ffmpeg-devel [mailto:ffmpeg-devel-boun...@ffmpeg.org] Im
Auftrag von Michael Niedermayer
Gesendet: Donnerstag, 13. August 2015 17:41
An: FFmpeg development discussions and patches
Cc: Sven Dueking
Betreff: Re: [FFmpeg-devel] [PATCH] Changed max bitrate for VBV
mode
(according to Ivan Uskow)
On Thu, Aug 13, 2015 at 11:30:45AM +0100, Sven Dueking wrote:
From: Sven Dueking s...@nablet.com
---
libavcodec/qsvenc.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index
57f5fe4..b56e4b4 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -118,10 +118,14 @@ static int init_video_param(AVCodecContext
*avctx, QSVEncContext *q)
switch (q-param.mfx.RateControlMethod) {
case MFX_RATECONTROL_CBR:
+ q-param.mfx.InitialDelayInKB = avctx-
rc_initial_buffer_occupancy / 1000;
+q-param.mfx.TargetKbps = avctx-bit_rate / 1000;
+q-param.mfx.MaxKbps = avctx-bit_rate / 1000;
+break;
case MFX_RATECONTROL_VBR:
q-param.mfx.InitialDelayInKB = avctx-
rc_initial_buffer_occupancy / 1000;
q-param.mfx.TargetKbps = avctx-bit_rate / 1000;
-q-param.mfx.MaxKbps = avctx-bit_rate / 1000;
+q-param.mfx.MaxKbps = avctx-rc_max_rate /
1000;
why is rc_max_rate not used for MFX_RATECONTROL_CBR ?
Hi Michael,
Ivan is on vacation and I did the fix according to his last command :
This correct for MFX_RATECONTROL_CBR but a bug for
MFX_RATECONTROL_VBR.
Will fixed later. For any case part of ratecontrol setup should be
re-designed to support more advanced LA rate contol
The Intel Documentation states that :
For variable bitrate control, the MaxKbps parameter specifies the
maximum bitrate at which the encoded data enters the Video Buffering
Verifier (VBV) buffer.
And for CBR the target bitrate and max bitrate should be equal to
archive a bitrate that is near a desired target for streaming (no
peaks etc.)
In the code there is this:
} else if (avctx-rc_max_rate == avctx-bit_rate) {
q-param.mfx.RateControlMethod = MFX_RATECONTROL_CBR;
ratecontrol_desc = constant bitrate (CBR);
assuming thats how CBR is set, the variables are equal and the special
case is not needed am i missing something ?
No, you are right. I missed that. So max_rate and bit_rate have the same
value.. means you can ignore my patch or keep it for readability.
the patch also changes MaxKbps for
MFX_RATECONTROL_VBR
that change looks correct, do you agree ?
if so please resubmit a patch with only it
thanks
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Those who are too smart to engage in politics are punished by being
governed by those who are dumber. -- Plato
signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] movtextdec: Add support for automatic text wrapping
From: Niklesh niklesh.lalw...@iitb.ac.in
The value of wrap_flag in the Text Wrap Box specifies if the text is to be
wrapped or not.
Uses 'end of line wrap' amongst the wrap styles supported by ASS if the text is
to be wrapped, i.e; fill as much text in a line as possible, then break to next
line.
The 3GPP spec has no provision for smart wrapping.
Signed-off-by: Niklesh niklesh.lalw...@iitb.ac.in
---
libavcodec/movtextdec.c | 25 -
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c
index 6d7885b..8f1015a 100644
--- a/libavcodec/movtextdec.c
+++ b/libavcodec/movtextdec.c
@@ -36,6 +36,7 @@
#define STYL_BOX (10)
#define HLIT_BOX (11)
#define HCLR_BOX (12)
+#define TWRP_BOX (13)
#define BOTTOM_LEFT 1
#define BOTTOM_CENTER 2
@@ -81,12 +82,17 @@ typedef struct {
} HilightcolorBox;
typedef struct {
+uint8_t wrap_flag;
+} TextWrapBox;
+
+typedef struct {
StyleBox **s;
StyleBox *s_temp;
HighlightBox h;
HilightcolorBox c;
FontRecord **ftab;
FontRecord *ftab_temp;
+TextWrapBox w;
MovTextDefault d;
uint8_t box_flags;
uint16_t style_entries, ftab_entries;
@@ -240,6 +246,13 @@ static int mov_text_tx3g(AVCodecContext *avctx,
MovTextContext *m)
return 0;
}
+static int decode_twrp(const uint8_t *tsmb, MovTextContext *m, AVPacket *avpkt)
+{
+m-box_flags |= TWRP_BOX;
+m-w.wrap_flag = *tsmb++;
+return 0;
+}
+
static int decode_hlit(const uint8_t *tsmb, MovTextContext *m, AVPacket *avpkt)
{
m-box_flags |= HLIT_BOX;
@@ -298,7 +311,8 @@ static int decode_styl(const uint8_t *tsmb, MovTextContext
*m, AVPacket *avpkt)
static const Box box_types[] = {
{ MKBETAG('s','t','y','l'), 2, decode_styl },
{ MKBETAG('h','l','i','t'), 4, decode_hlit },
-{ MKBETAG('h','c','l','r'), 4, decode_hclr }
+{ MKBETAG('h','c','l','r'), 4, decode_hclr },
+{ MKBETAG('t','w','r','p'), 1, decode_twrp }
};
const static size_t box_count = FF_ARRAY_ELEMS(box_types);
@@ -309,6 +323,15 @@ static int text_to_ass(AVBPrint *buf, const char *text,
const char *text_end,
int i = 0;
int j = 0;
int text_pos = 0;
+
+if (text text_end m-box_flags TWRP_BOX) {
+if (m-w.wrap_flag == 1) {
+av_bprintf(buf, {\\q1}); /* End of line wrap */
+} else {
+av_bprintf(buf, {\\q2}); /* No wrap */
+}
+}
+
while (text text_end) {
if (m-box_flags STYL_BOX) {
for (i = 0; i m-style_entries; i++) {
--
1.9.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] aacdec_template: remove obsolete warning suppression
On Fri, Aug 14, 2015 at 5:14 AM, Michael Niedermayer
mich...@niedermayer.cc wrote:
On Thu, Aug 13, 2015 at 08:57:12PM -0400, Ganesh Ajjanagadde wrote:
On Thu, Jul 30, 2015 at 4:06 PM, Ganesh Ajjanagadde
gajjanaga...@gmail.com wrote:
Signed-off-by: Ganesh Ajjanagadde gajjanaga...@gmail.com
---
libavcodec/aacdec_template.c | 5 -
1 file changed, 5 deletions(-)
diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index 2f270bc..d7849da 100644
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@@ -1907,11 +1907,6 @@ static int decode_ics(AACContext *ac,
SingleChannelElement *sce,
ac-oc[1].m4ac.object_type == AOT_ER_AAC_LD ||
ac-oc[1].m4ac.object_type == AOT_ER_AAC_ELD;
-/* This assignment is to silence a GCC warning about the variable
being used
- * uninitialized when in fact it always is.
- */
-pulse.num_pulse = 0;
-
global_gain = get_bits(gb, 8);
if (!common_window !scale_flag) {
--
2.5.0
I guess I should have clarified the intent of this patch:
This particular code only existed (as shown in the comment) to work
around a compiler bug regarding diagnostics.
Said compiler bug does not affect GCC of any recent vintage (I run the
latest 5.2, but tested 4.8.1),
many people and also developers still use older compilers
false positive warnings distract from real issues
There is a balance that we strike here:
some devs use new, shiny compilers that may have bugs fixed
(but may introduce new bugs of their own, see e.g the -Warray-bounds stuff),
some others may use old versions requiring the workaround.
It is a matter of subjective interpretatition as to what workarounds
are ugly and which are not.
I consider this one not that bad, so without information on when it
was triggered/fixed,
I agree with you.
Nevertheless, see the analysis below.
do you know in which version of gcc this was fixed?
I can only speculate here.
The trouble is -Wuninitialized has too many instances on the bug
tracker, and I can't pinpoint it.
So I tested GCC down to 4.7 (not a complete search, but tested all
feature releases 4.x.0).
The warning is not triggered.
Keep in mind that this hack was added a long time back in commit
9cc04edff9 dating to Aug 2008.
This is roughly the GCC 4.2-4.3 era.
Note also the release notes for GCC 4.4.x tell us that heavy work was
done on -Wuninitialized,
and in GCC 4.5.2 regressions from 4.4 were cleaned up:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48028.
In summary, I would estimate somewhere between 4.3 and 4.5.
I can't do further work, since those versions of GCC don't even build
with their latest compiler
unless I string together a bunch of hacks/patches.
I think in future such hacks should have the version number of the
tool in the comment,
it is trivial work to report version number (e.g gcc -v), helps a lot
with removing ugly
hacks at a later date, and can be easily done while reviewing patches.
The current comment only informs us of a GCC problem, but not when.
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
it is not once nor twice but times without number that the same ideas make
their appearance in the world. -- Aristotle
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH]Thumbnail idr frame decoding optimization
Please find attached the patch for thumbnail idr frame decoding optimization. This change is to decode only the idr frames for the thumbnails instead of decoding all the video frames. Sailaja Mahendrakar Senior Staff Engineer Imagine Communications imaginecommunications.comhttp://www.imaginecommunications.com [cid:image001.png@01D06313.9C9B5B60]http://www.imaginecommunications.com/ thumbnailIdrFrame.patch Description: thumbnailIdrFrame.patch ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 2/3] RFC: Should be squashed in the previous patch if OK
On Fri, Aug 14, 2015 at 6:44 PM, Alexander Strasser eclip...@gmx.net wrote: On 2015-08-14 17:35 -0400, Ganesh Ajjanagadde wrote: On Fri, Aug 14, 2015 at 4:46 PM, Alexander Strasser eclip...@gmx.net wrote: Signed-off-by: Alexander Strasser eclip...@gmx.net --- libavutil/parseutils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/parseutils.h b/libavutil/parseutils.h index b04aa89..cff5123 100644 --- a/libavutil/parseutils.h +++ b/libavutil/parseutils.h @@ -112,7 +112,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, const char *av_get_known_color_name(int color_idx, const uint8_t **rgb); /** - * Parse timestr and return in *timeval a corresponding number of + * Parse timestr and return in *timeval the corresponding number of * microseconds. * * @param timeval puts here the number of microseconds corresponding -- So how exactly is this different from patch 1/3? Are you sure you emailed the right patch? Here I replaced a with the. Saying it returns *a* corresponding number of microseconds kind of suggests there is more then one value it could choose from. Well maybe you could say the original is kind of true for dates because of timezones etc... Anyway it is more like a cosmetic change if it doesn't resonate with others, I will just drop this patch. I am fine either way. However, I strongly agree that if you want to change this, it should be squashed. It is too trivial a commit in my view to stand on its own. Note that the subtleties of article usage in English are tough even for native English speakers, and are glossed over by most of us while reading quickly (which is why I did not understand the patch initially). Alexander ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]Thumbnail idr frame decoding optimization
On Sat, Aug 15, 2015 at 12:23 AM, Sailaja Mahendrakar smahendra...@rgbnetworks.com wrote: Please find attached the patch for thumbnail idr frame decoding optimization. This change is to decode only the idr frames for the thumbnails instead of decoding all the video frames. Your patch is unacceptable in its current form. However, luckily for you we already have a mode like that, look into the discard flags, specifically the nonkey mode, which discards everything but key frames. - Hendrik ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 1/3] libavutil: av_parse_time: Fix typo in doc
On Fri, Aug 14, 2015 at 4:45 PM, Alexander Strasser eclip...@gmx.net wrote: Signed-off-by: Alexander Strasser eclip...@gmx.net --- libavutil/parseutils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/parseutils.h b/libavutil/parseutils.h index e66d24b..b04aa89 100644 --- a/libavutil/parseutils.h +++ b/libavutil/parseutils.h @@ -112,7 +112,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, const char *av_get_known_color_name(int color_idx, const uint8_t **rgb); /** - * Parse timestr and return in *time a corresponding number of + * Parse timestr and return in *timeval a corresponding number of * microseconds. Ok, but this is not complete, see nearby line: If timestr cannot be successfully parsed, set *time... - this should also be changed * * @param timeval puts here the number of microseconds corresponding -- ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 2/3] RFC: Should be squashed in the previous patch if OK
On Fri, Aug 14, 2015 at 4:46 PM, Alexander Strasser eclip...@gmx.net wrote: Signed-off-by: Alexander Strasser eclip...@gmx.net --- libavutil/parseutils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/parseutils.h b/libavutil/parseutils.h index b04aa89..cff5123 100644 --- a/libavutil/parseutils.h +++ b/libavutil/parseutils.h @@ -112,7 +112,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, const char *av_get_known_color_name(int color_idx, const uint8_t **rgb); /** - * Parse timestr and return in *timeval a corresponding number of + * Parse timestr and return in *timeval the corresponding number of * microseconds. * * @param timeval puts here the number of microseconds corresponding -- So how exactly is this different from patch 1/3? Are you sure you emailed the right patch? ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] examples/avio_list_dir: add move and delete methods
---
doc/examples/avio_list_dir.c | 92
1 file changed, 76 insertions(+), 16 deletions(-)
diff --git a/doc/examples/avio_list_dir.c b/doc/examples/avio_list_dir.c
index 4060ba6..50c435c 100644
--- a/doc/examples/avio_list_dir.c
+++ b/doc/examples/avio_list_dir.c
@@ -54,28 +54,13 @@ static const char *type_string(int type)
return UNKNOWN;
}
-int main(int argc, char *argv[])
+static int list_op(const char *input_dir)
{
-const char *input_dir = NULL;
AVIODirEntry *entry = NULL;
AVIODirContext *ctx = NULL;
int cnt, ret;
char filemode[4], uid_and_gid[20];
-av_log_set_level(AV_LOG_DEBUG);
-
-if (argc != 2) {
-fprintf(stderr, usage: %s input_dir\n
-API example program to show how to list files in directory
-accessed through AVIOContext.\n, argv[0]);
-return 1;
-}
-input_dir = argv[1];
-
-/* register codecs and formats and other lavf/lavc components*/
-av_register_all();
-avformat_network_init();
-
if ((ret = avio_open_dir(ctx, input_dir, NULL)) 0) {
av_log(NULL, AV_LOG_ERROR, Cannot open directory: %s.\n,
av_err2str(ret));
goto fail;
@@ -114,6 +99,81 @@ int main(int argc, char *argv[])
fail:
avio_close_dir(ctx);
+return ret;
+}
+
+static int del_op(const char *url)
+{
+int ret = avpriv_io_delete(url);
+if (ret 0)
+av_log(NULL, AV_LOG_ERROR, Cannot delete '%s': %s.\n, url,
av_err2str(ret));
+return ret;
+}
+
+static int move_op(const char *src, const char *dst)
+{
+int ret = avpriv_io_move(src, dst);
+if (ret 0)
+av_log(NULL, AV_LOG_ERROR, Cannot move '%s' into '%s': %s.\n, src,
dst, av_err2str(ret));
+return ret;
+}
+
+
+static void usage(const char *program_name)
+{
+fprintf(stderr, usage: %s OPERATION entry1 [entry2]\n
+API example program to show how to manipulate resources
+accessed through AVIOContext.\n
+OPERATIONS:\n
+list list content of the directory\n
+move rename content in directory\n
+del delete content in directory\n,
+program_name);
+}
+
+int main(int argc, char *argv[])
+{
+const char *op = NULL;
+int ret;
+
+av_log_set_level(AV_LOG_DEBUG);
+
+if (argc 2) {
+usage(argv[0]);
+return 1;
+}
+
+/* register codecs and formats and other lavf/lavc components*/
+av_register_all();
+avformat_network_init();
+
+op = argv[1];
+if (strcmp(op, list) == 0) {
+if (argc 3) {
+av_log(NULL, AV_LOG_INFO, Missing argument for list
operation.\n);
+ret = AVERROR(EINVAL);
+} else {
+ret = list_op(argv[2]);
+}
+} else if (strcmp(op, del) == 0) {
+if (argc 3) {
+av_log(NULL, AV_LOG_INFO, Missing argument for del operation.\n);
+ret = AVERROR(EINVAL);
+} else {
+ret = del_op(argv[2]);
+}
+} else if (strcmp(op, move) == 0) {
+if (argc 4) {
+av_log(NULL, AV_LOG_INFO, Missing argument for move
operation.\n);
+ret = AVERROR(EINVAL);
+} else {
+ret = move_op(argv[2], argv[3]);
+}
+} else {
+av_log(NULL, AV_LOG_INFO, Invalid operation %s\n, op);
+ret = AVERROR(EINVAL);
+}
+
avformat_network_deinit();
return ret 0 ? 1 : 0;
--
2.4.6
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 1/3] libavutil: av_parse_time: Fix typo in doc
On 2015-08-14 16:59 -0400, Ganesh Ajjanagadde wrote: On Fri, Aug 14, 2015 at 4:45 PM, Alexander Strasser eclip...@gmx.net wrote: Signed-off-by: Alexander Strasser eclip...@gmx.net --- libavutil/parseutils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/parseutils.h b/libavutil/parseutils.h index e66d24b..b04aa89 100644 --- a/libavutil/parseutils.h +++ b/libavutil/parseutils.h @@ -112,7 +112,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, const char *av_get_known_color_name(int color_idx, const uint8_t **rgb); /** - * Parse timestr and return in *time a corresponding number of + * Parse timestr and return in *timeval a corresponding number of * microseconds. Ok, but this is not complete, see nearby line: If timestr cannot be successfully parsed, set *time... - this should also be changed Good catch! Changed locally. Did you spot more than that one additional occurrence. Alexander pgptVroNzpDNi.pgp Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 1/3] libavutil: av_parse_time: Fix typo in doc
Signed-off-by: Alexander Strasser eclip...@gmx.net --- libavutil/parseutils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/parseutils.h b/libavutil/parseutils.h index e66d24b..b04aa89 100644 --- a/libavutil/parseutils.h +++ b/libavutil/parseutils.h @@ -112,7 +112,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, const char *av_get_known_color_name(int color_idx, const uint8_t **rgb); /** - * Parse timestr and return in *time a corresponding number of + * Parse timestr and return in *timeval a corresponding number of * microseconds. * * @param timeval puts here the number of microseconds corresponding -- pgpVO3xgsgrYf.pgp Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] aacdec_template: remove obsolete warning suppression
On Fri, Aug 14, 2015 at 12:57:35PM -0400, Ganesh Ajjanagadde wrote: On Fri, Aug 14, 2015 at 5:14 AM, Michael Niedermayer mich...@niedermayer.cc wrote: On Thu, Aug 13, 2015 at 08:57:12PM -0400, Ganesh Ajjanagadde wrote: On Thu, Jul 30, 2015 at 4:06 PM, Ganesh Ajjanagadde gajjanaga...@gmail.com wrote: Signed-off-by: Ganesh Ajjanagadde gajjanaga...@gmail.com [...] I think in future such hacks should have the version number of the tool in the comment, i agree, this is very easy to forget though [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Into a blind darkness they enter who follow after the Ignorance, they as if into a greater darkness enter who devote themselves to the Knowledge alone. -- Isha Upanishad signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 3/3] doc/metadata: Default timestamp unit is nanoseconds
Signed-off-by: Alexander Strasser eclip...@gmx.net
---
doc/metadata.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/metadata.texi b/doc/metadata.texi
index bddcc99..be91059 100644
--- a/doc/metadata.texi
+++ b/doc/metadata.texi
@@ -33,7 +33,7 @@ At the beginning of a chapter section there may be an
optional timebase to be
used for start/end values. It must be in form
@samp{TIMEBASE=@var{num}/@var{den}}, where @var{num} and @var{den} are
integers. If the timebase is missing then start/end times are assumed to
-be in milliseconds.
+be in nanoseconds.
Next a chapter section must contain chapter start and end times in form
@samp{START=@var{num}}, @samp{END=@var{num}}, where @var{num} is a positive
--
pgpGrt14PTePj.pgp
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH]lavc/mjpegdec: Detect more CMYK images
Hi!
Attached patch fixes ticket #4772 for me.
Please comment, Carl Eugendiff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 899af4e..039fe0e 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -345,6 +345,12 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
i, h_count[i], v_count[i],
s-component_id[i], s-quant_index[i]);
}
+if ( nb_components == 4
+ s-component_id[0] == 'C' - 1
+ s-component_id[1] == 'M' - 1
+ s-component_id[2] == 'Y' - 1
+ s-component_id[3] == 'K' - 1)
+s-adobe_transform = 0;
if (s-ls (s-h_max 1 || s-v_max 1)) {
avpriv_report_missing_feature(s-avctx, Subsampling in JPEG-LS);
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 1/3] libavutil: av_parse_time: Fix typo in doc
On Fri, Aug 14, 2015 at 6:52 PM, Alexander Strasser eclip...@gmx.net wrote: On 2015-08-14 16:59 -0400, Ganesh Ajjanagadde wrote: On Fri, Aug 14, 2015 at 4:45 PM, Alexander Strasser eclip...@gmx.net wrote: Signed-off-by: Alexander Strasser eclip...@gmx.net --- libavutil/parseutils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/parseutils.h b/libavutil/parseutils.h index e66d24b..b04aa89 100644 --- a/libavutil/parseutils.h +++ b/libavutil/parseutils.h @@ -112,7 +112,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, const char *av_get_known_color_name(int color_idx, const uint8_t **rgb); /** - * Parse timestr and return in *time a corresponding number of + * Parse timestr and return in *timeval a corresponding number of * microseconds. Ok, but this is not complete, see nearby line: If timestr cannot be successfully parsed, set *time... - this should also be changed Good catch! Changed locally. Did you spot more than that one additional occurrence. no Alexander ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] movtextdec: Add support for automatic text wrapping
On Fri, 14 Aug 2015 20:19:51 +0530
Niklesh Lalwani niklesh.lalw...@iitb.ac.in wrote:
From: Niklesh niklesh.lalw...@iitb.ac.in
The value of wrap_flag in the Text Wrap Box specifies if the text is
to be wrapped or not. Uses 'end of line wrap' amongst the wrap styles
supported by ASS if the text is to be wrapped, i.e; fill as much text
in a line as possible, then break to next line. The 3GPP spec has no
provision for smart wrapping.
Signed-off-by: Niklesh niklesh.lalw...@iitb.ac.in
---
libavcodec/movtextdec.c | 25 -
1 file changed, 24 insertions(+), 1 deletion(-)
Pushed. Thanks.
diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c
index 6d7885b..8f1015a 100644
--- a/libavcodec/movtextdec.c
+++ b/libavcodec/movtextdec.c
@@ -36,6 +36,7 @@
#define STYL_BOX (10)
#define HLIT_BOX (11)
#define HCLR_BOX (12)
+#define TWRP_BOX (13)
#define BOTTOM_LEFT 1
#define BOTTOM_CENTER 2
@@ -81,12 +82,17 @@ typedef struct {
} HilightcolorBox;
typedef struct {
+uint8_t wrap_flag;
+} TextWrapBox;
+
+typedef struct {
StyleBox **s;
StyleBox *s_temp;
HighlightBox h;
HilightcolorBox c;
FontRecord **ftab;
FontRecord *ftab_temp;
+TextWrapBox w;
MovTextDefault d;
uint8_t box_flags;
uint16_t style_entries, ftab_entries;
@@ -240,6 +246,13 @@ static int mov_text_tx3g(AVCodecContext *avctx,
MovTextContext *m) return 0;
}
+static int decode_twrp(const uint8_t *tsmb, MovTextContext *m,
AVPacket *avpkt) +{
+m-box_flags |= TWRP_BOX;
+m-w.wrap_flag = *tsmb++;
+return 0;
+}
+
static int decode_hlit(const uint8_t *tsmb, MovTextContext *m,
AVPacket *avpkt) {
m-box_flags |= HLIT_BOX;
@@ -298,7 +311,8 @@ static int decode_styl(const uint8_t *tsmb,
MovTextContext *m, AVPacket *avpkt) static const Box box_types[] = {
{ MKBETAG('s','t','y','l'), 2, decode_styl },
{ MKBETAG('h','l','i','t'), 4, decode_hlit },
-{ MKBETAG('h','c','l','r'), 4, decode_hclr }
+{ MKBETAG('h','c','l','r'), 4, decode_hclr },
+{ MKBETAG('t','w','r','p'), 1, decode_twrp }
};
const static size_t box_count = FF_ARRAY_ELEMS(box_types);
@@ -309,6 +323,15 @@ static int text_to_ass(AVBPrint *buf, const char
*text, const char *text_end, int i = 0;
int j = 0;
int text_pos = 0;
+
+if (text text_end m-box_flags TWRP_BOX) {
+if (m-w.wrap_flag == 1) {
+av_bprintf(buf, {\\q1}); /* End of line wrap */
+} else {
+av_bprintf(buf, {\\q2}); /* No wrap */
+}
+}
+
while (text text_end) {
if (m-box_flags STYL_BOX) {
for (i = 0; i m-style_entries; i++) {
--phil
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] examples/avio_list_dir: add move and delete methods
On Sat, Aug 15, 2015 at 02:01:20AM +0200, Mariusz Szczepańczyk wrote: --- doc/examples/avio_list_dir.c | 92 1 file changed, 76 insertions(+), 16 deletions(-) diff --git a/doc/examples/avio_list_dir.c b/doc/examples/avio_list_dir.c index 4060ba6..50c435c 100644 --- a/doc/examples/avio_list_dir.c +++ b/doc/examples/avio_list_dir.c applied maybe the example should be renamed though as it does more than list directories now thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Its not that you shouldnt use gotos but rather that you should write readable code and code with gotos often but not always is less readable signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH]lavc/mjpegdec: Detect more CMYK images
On Sat, Aug 15, 2015 at 02:03:39AM +0200, CarlEugen Hoyos wrote: Hi! Attached patch fixes ticket #4772 for me. Please comment, Carl Eugen probably ok [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB While the State exists there can be no freedom; when there is freedom there will be no State. -- Vladimir Lenin signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] Set MaxKpbs to rc_max_rate for CBR and VBR (bitrate is equal to rc_max_rate for CBR)
From ebb8a991dc2f64577266dae66c95131564781a38 Mon Sep 17 00:00:00 2001 From: Sven Dueking s...@nablet.com Date: Fri, 14 Aug 2015 11:28:00 +0100 Subject: [FFmpeg-devel][PATCH] Set MaxKpbs to rc_max_rate for CBR and VBR (bitrate is equal to rc_max_rate for CBR) --- libavcodec/qsvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 57f5fe4..e5d3fa6 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -121,7 +121,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) case MFX_RATECONTROL_VBR: q-param.mfx.InitialDelayInKB = avctx-rc_initial_buffer_occupancy / 1000; q-param.mfx.TargetKbps = avctx-bit_rate / 1000; -q-param.mfx.MaxKbps = avctx-bit_rate / 1000; +q-param.mfx.MaxKbps = avctx-rc_max_rate / 1000; break; case MFX_RATECONTROL_CQP: quant = avctx-global_quality / FF_QP2LAMBDA; -- 1.8.3.1 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] mxfdec: set AVFMT_SEEK_TO_PTS demuxer flag
On Mon, 2015-08-10 at 10:14 +0200, Tomas Härdin wrote:
On Sun, 2015-08-09 at 20:32 +0200, Marton Balint wrote:
Since 53f2ef2c4afb1d49a679dea9163cb0e4671f3117 seeking is done using PTS.
Signed-off-by: Marton Balint c...@passwd.hu
---
libavformat/mxfdec.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 2d921db..5734976 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -3210,6 +3210,7 @@ static int mxf_read_seek(AVFormatContext *s, int
stream_index, int64_t sample_ti
AVInputFormat ff_mxf_demuxer = {
.name = mxf,
.long_name = NULL_IF_CONFIG_SMALL(MXF (Material eXchange
Format)),
+.flags = AVFMT_SEEK_TO_PTS,
.priv_data_size = sizeof(MXFContext),
.read_probe = mxf_probe,
.read_header= mxf_read_header,
Yeah, I seem to recall this when swearing at the seek code in mxfdec
some years ago. I'll wait a few days to see if any other MXF guys have
something to say here or on IRC, then I suppose I'll push
/Tomas
Pushed. Hopefully everything worked alright
/Tomas
signature.asc
Description: This is a digitally signed message part
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] From: Sven Dueking s...@nablet.com
--- libavcodec/qsvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 57f5fe4..af4b5af 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -121,7 +121,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) case MFX_RATECONTROL_VBR: q-param.mfx.InitialDelayInKB = avctx-rc_initial_buffer_occupancy / 1000; q-param.mfx.TargetKbps = avctx-bit_rate / 1000; -q-param.mfx.MaxKbps = avctx-bit_rate / 1000; +q-param.mfx.MaxKbps = q-param.mfx.RateControlMethod == MFX_RATECONTROL_VBR ? avctx-rc_max_rate / 1000 : avctx-bit_rate / 1000; break; case MFX_RATECONTROL_CQP: quant = avctx-global_quality / FF_QP2LAMBDA; -- 1.8.3.1 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] From: Sven Dueking s...@nablet.com
On Fri, Aug 14, 2015 at 10:34:29AM +0100, Sven Dueking wrote: --- libavcodec/qsvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 57f5fe4..af4b5af 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -121,7 +121,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) case MFX_RATECONTROL_VBR: q-param.mfx.InitialDelayInKB = avctx-rc_initial_buffer_occupancy / 1000; q-param.mfx.TargetKbps = avctx-bit_rate / 1000; -q-param.mfx.MaxKbps = avctx-bit_rate / 1000; +q-param.mfx.MaxKbps = q-param.mfx.RateControlMethod == MFX_RATECONTROL_VBR ? avctx-rc_max_rate / 1000 : avctx-bit_rate / 1000; thats still containing the unneeded CBR special case you can either explain why this should be done or remove it In the code currently MFX_RATECONTROL_CBR implies avctx-rc_max_rate == avctx-bit_rate if avctx-rc_max_rate == avctx-bit_rate then either avctx-rc_max_rate or avctx-bit_rate can be used interchagable q-param.mfx.MaxKbps = avctx-rc_max_rate is the correct code for VBR and CBR if rc_max_rate is unequal bit_rate then its not CBR and MFX_RATECONTROL_CBR should not be set. Is any of the statements above wrong, am i missing something ? [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Republics decline into democracies and democracies degenerate into despotisms. -- Aristotle signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] doc/demuxers/mpegts: update documentation
On date Friday 2015-08-14 11:33:57 +0200, Michael Niedermayer encoded: On Fri, Aug 14, 2015 at 11:15:43AM +0200, Stefano Sabatini wrote: [...] demuxers.texi | 13 + 1 file changed, 13 insertions(+) 69139cef59232f0c319defb217a375194acba585 0002-doc-demuxers-mpegts-update-documentation.patch From 81cbdd00f9a2ce5a2a8ece6148315e4255ec Mon Sep 17 00:00:00 2001 From: Stefano Sabatini stefa...@gmail.com Date: Thu, 13 Aug 2015 13:19:20 +0200 Subject: [PATCH] doc/demuxers/mpegts: update documentation The description is yet crappy, it merely copies the description of the added and undocumented options and their value range. More descriptive documentation is welcome. --- doc/demuxers.texi | 13 + 1 file changed, 13 insertions(+) LGTM for scan_all_pmts, named identifers could be added, thats unrelated to this patch though thanks Applied, with more minor fixes. Thanks. -- FFmpeg = Fantastic Forgiving Mastodontic Practical Enhancing Generator ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] doc/demuxers/mpegts: update documentation
On Fri, Aug 14, 2015 at 11:15:43AM +0200, Stefano Sabatini wrote: On date Friday 2015-08-14 00:16:31 +0200, Michael Niedermayer encoded: On Thu, Aug 13, 2015 at 01:26:30PM +0200, Stefano Sabatini wrote: The description is yet crappy, it merely copies the description of the added and undocumented options and their value range. More descriptive documentation is welcome. --- doc/demuxers.texi | 19 +++ 1 file changed, 19 insertions(+) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index e45e1af..e4f5f8f 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -414,13 +414,32 @@ ffmpeg -framerate 10 -pattern_type glob -i *.png out.mkv MPEG-2 transport stream demuxer. +This demuxer accepts the following options: @table @option +@item resync_size +Set size limit for looking up a new synchronization. Default value is +65536. @item fix_teletext_pts Overrides teletext packet PTS and DTS values with the timestamps calculated from the PCR of the first program which the teletext stream is part of and is not discarded. Default value is 1, set this option to 0 if you want your teletext packet PTS and DTS values untouched. + +@item ts_packetsize +Output option carrying the raw packet size in bytes. +Show the detected raw packet size, cannot be set by the user. + +@item scan_all_pmts +Scan and combine all PMTs. The value is an integer with value from -1 +to 1, default value is -1. -1 - auto 1 - enabled 0-disabled +@item skip_changes +Skip changing / adding streams / programs when set to 1. +Default value is 0. + +@item skip_clear +Skip clearing programs if set to 1. Default value is 0. @end table these 2 are intended to be used internally by libavformat i guess applications could use them too but they are not marked as demuxer or muxer options and they arent in the help output presented to users Uhm, so I think I'll skip them. Thanks, updated. -- FFmpeg = Faithless and Fierce Multipurpose Power Exuberant Gymnast demuxers.texi | 13 + 1 file changed, 13 insertions(+) 69139cef59232f0c319defb217a375194acba585 0002-doc-demuxers-mpegts-update-documentation.patch From 81cbdd00f9a2ce5a2a8ece6148315e4255ec Mon Sep 17 00:00:00 2001 From: Stefano Sabatini stefa...@gmail.com Date: Thu, 13 Aug 2015 13:19:20 +0200 Subject: [PATCH] doc/demuxers/mpegts: update documentation The description is yet crappy, it merely copies the description of the added and undocumented options and their value range. More descriptive documentation is welcome. --- doc/demuxers.texi | 13 + 1 file changed, 13 insertions(+) LGTM for scan_all_pmts, named identifers could be added, thats unrelated to this patch though thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB No human being will ever know the Truth, for even if they happen to say it by chance, they would not even known they had done so. -- Xenophanes signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] From: Sven Dueking s...@nablet.com
-Ursprüngliche Nachricht- Von: ffmpeg-devel [mailto:ffmpeg-devel-boun...@ffmpeg.org] Im Auftrag von Michael Niedermayer Gesendet: Freitag, 14. August 2015 11:55 An: FFmpeg development discussions and patches Betreff: Re: [FFmpeg-devel] From: Sven Dueking s...@nablet.com On Fri, Aug 14, 2015 at 10:34:29AM +0100, Sven Dueking wrote: --- libavcodec/qsvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 57f5fe4..af4b5af 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -121,7 +121,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) case MFX_RATECONTROL_VBR: q-param.mfx.InitialDelayInKB = avctx- rc_initial_buffer_occupancy / 1000; q-param.mfx.TargetKbps = avctx-bit_rate / 1000; -q-param.mfx.MaxKbps = avctx-bit_rate / 1000; +q-param.mfx.MaxKbps = q- param.mfx.RateControlMethod == MFX_RATECONTROL_VBR ? avctx- rc_max_rate / 1000 : avctx-bit_rate / 1000; thats still containing the unneeded CBR special case you can either explain why this should be done or remove it In the code currently MFX_RATECONTROL_CBR implies avctx-rc_max_rate == avctx-bit_rate Correct. if avctx-rc_max_rate == avctx-bit_rate then either avctx-rc_max_rate or avctx-bit_rate can be used interchagable Correct. q-param.mfx.MaxKbps = avctx-rc_max_rate is the correct code for VBR and CBR Okay, got it. I should do remove q-param.mfx.MaxKbps = avctx-bit_rate / 1000; and use q-param.mfx.MaxKbps = avctx- rc_max_rate / 1000; for both cases. I will send another patch ... if rc_max_rate is unequal bit_rate then its not CBR and MFX_RATECONTROL_CBR should not be set. Correct. Is any of the statements above wrong, am i missing something ? Nope, you are right and I should check double check everything the next time. [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Republics decline into democracies and democracies degenerate into despotisms. -- Aristotle ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] Set MaxKpbs to rc_max_rate for CBR and VBR (bitrate is equal to rc_max_rate for CBR)
On Fri, Aug 14, 2015 at 12:46:22PM +0200, Sven Dueking wrote: From ebb8a991dc2f64577266dae66c95131564781a38 Mon Sep 17 00:00:00 2001 From: Sven Dueking s...@nablet.com Date: Fri, 14 Aug 2015 11:28:00 +0100 Subject: [FFmpeg-devel][PATCH] Set MaxKpbs to rc_max_rate for CBR and VBR (bitrate is equal to rc_max_rate for CBR) applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB During times of universal deceit, telling the truth becomes a revolutionary act. -- George Orwell signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
