Re: [FFmpeg-devel] [PATCH 1/2] avformat/mxfenc: fix aspect ratio when writing 16:9 DV frames

2017-09-18 Thread Tobias Rapp 

On 15.09.2017 20:44, Michael Niedermayer wrote:

On Thu, Sep 14, 2017 at 03:44:41PM +0200, Tobias Rapp wrote:

Signed-off-by: Tobias Rapp 
---
  libavformat/mxfenc.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 7289e0b..da4d7b4 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -1810,7 +1810,7 @@ static int mxf_parse_dv_frame(AVFormatContext *s, 
AVStream *st, AVPacket *pkt)
  stype= vs_pack[3] & 0x1f;
  pal  = (vs_pack[3] >> 5) & 0x1;
  
-if ((vs_pack[2] & 0x07) == 0x02)

+if ((vsc_pack[2] & 0x07) == 0x02)
  sc->aspect_ratio = (AVRational){ 16, 9 };
  else
  sc->aspect_ratio = (AVRational){ 4, 3 };


LGTM

thanks


Applied, thanks for the review.

Tobias

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 1/2] avformat/mxfenc: fix aspect ratio when writing 16:9 DV frames

2017-09-15 Thread Michael Niedermayer 
On Thu, Sep 14, 2017 at 03:44:41PM +0200, Tobias Rapp wrote:
> Signed-off-by: Tobias Rapp 
> ---
>  libavformat/mxfenc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
> index 7289e0b..da4d7b4 100644
> --- a/libavformat/mxfenc.c
> +++ b/libavformat/mxfenc.c
> @@ -1810,7 +1810,7 @@ static int mxf_parse_dv_frame(AVFormatContext *s, 
> AVStream *st, AVPacket *pkt)
>  stype= vs_pack[3] & 0x1f;
>  pal  = (vs_pack[3] >> 5) & 0x1;
>  
> -if ((vs_pack[2] & 0x07) == 0x02)
> +if ((vsc_pack[2] & 0x07) == 0x02)
>  sc->aspect_ratio = (AVRational){ 16, 9 };
>  else
>  sc->aspect_ratio = (AVRational){ 4, 3 };

LGTM

thanks

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I have often repented speaking, but never of holding my tongue.
-- Xenocrates


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 1/2] avformat/mxfenc: fix aspect ratio when writing 16:9 DV frames

2017-09-14 Thread Tobias Rapp 

On 14.09.2017 15:55, Tomas Härdin wrote:

On 2017-09-14 15:44, Tobias Rapp wrote:

Signed-off-by: Tobias Rapp 
---
  libavformat/mxfenc.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 7289e0b..da4d7b4 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -1810,7 +1810,7 @@ static int mxf_parse_dv_frame(AVFormatContext 
*s, AVStream *st, AVPacket *pkt)

  stype    = vs_pack[3] & 0x1f;
  pal  = (vs_pack[3] >> 5) & 0x1;
-    if ((vs_pack[2] & 0x07) == 0x02)
+    if ((vsc_pack[2] & 0x07) == 0x02)
  sc->aspect_ratio = (AVRational){ 16, 9 };
  else
  sc->aspect_ratio = (AVRational){ 4, 3 };


Might want to add some { } around those two cases while you're at it


Added to the list of cosmetic changes that I'll apply after this patch 
is accepted. See attached file for reference.


Regards,
Tobias
From 2a4a95b4d930bb5b511576ab2932969a37766adf Mon Sep 17 00:00:00 2001
From: Tobias Rapp 
Date: Thu, 14 Sep 2017 16:05:31 +0200
Subject: [PATCH] avformat/mxfenc: cosmetic changes

Signed-off-by: Tobias Rapp 
---
 libavformat/mxfenc.c | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index da4d7b4..b8d3030 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -846,7 +846,7 @@ static void mxf_write_track(AVFormatContext *s, AVStream 
*st, enum MXFMetadataSe
 // write edit rate
 mxf_write_local_tag(pb, 8, 0x4B01);
 
-if (st == mxf->timecode_track && s->oformat == _mxf_opatom_muxer){
+if (st == mxf->timecode_track && s->oformat == _mxf_opatom_muxer) {
 avio_wb32(pb, mxf->tc.rate.num);
 avio_wb32(pb, mxf->tc.rate.den);
 } else {
@@ -882,7 +882,7 @@ static void mxf_write_common_fields(AVFormatContext *s, 
AVStream *st)
 // write duration
 mxf_write_local_tag(pb, 8, 0x0202);
 
-if (st != mxf->timecode_track && s->oformat == _mxf_opatom_muxer && 
st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO){
+if (st != mxf->timecode_track && s->oformat == _mxf_opatom_muxer && 
st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
 avio_wb64(pb, mxf->body_offset / mxf->edit_unit_byte_count);
 } else {
 avio_wb64(pb, mxf->duration);
@@ -1194,7 +1194,7 @@ static void 
mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, con
 
 mxf_write_generic_desc(s, st, key, size+duration_size+5+12+8+8);
 
-if (duration_size > 0){
+if (duration_size > 0) {
 mxf_write_local_tag(pb, 8, 0x3002);
 avio_wb64(pb, mxf->body_offset / mxf->edit_unit_byte_count);
 }
@@ -1328,7 +1328,7 @@ static void mxf_write_package(AVFormatContext *s, enum 
MXFMetadataSetType type,
 // write uid
 mxf_write_local_tag(pb, 16, 0x3C0A);
 mxf_write_uuid(pb, type, 0);
-av_log(s,AV_LOG_DEBUG, "package type:%d\n", type);
+av_log(s, AV_LOG_DEBUG, "package type:%d\n", type);
 PRINT_KEY(s, "package uid", pb->buf_ptr - 16);
 
 // write package umid
@@ -1770,7 +1770,7 @@ AVPacket *pkt)
 sc->codec_ul = _essence_container_uls[sc->index].codec_ul;
 sc->aspect_ratio = (AVRational){ 16, 9 };
 
-if(s->oformat == _mxf_opatom_muxer){
+if (s->oformat == _mxf_opatom_muxer) {
 mxf->edit_unit_byte_count = frame_size;
 return 1;
 }
@@ -1810,10 +1810,11 @@ static int mxf_parse_dv_frame(AVFormatContext *s, 
AVStream *st, AVPacket *pkt)
 stype= vs_pack[3] & 0x1f;
 pal  = (vs_pack[3] >> 5) & 0x1;
 
-if ((vsc_pack[2] & 0x07) == 0x02)
+if ((vsc_pack[2] & 0x07) == 0x02) {
 sc->aspect_ratio = (AVRational){ 16, 9 };
-else
+} else {
 sc->aspect_ratio = (AVRational){ 4, 3 };
+}
 
 sc->interlaced = (vsc_pack[3] >> 4) & 0x01;
 // TODO: fix dv encoder to set proper FF/FS value in VSC pack
@@ -2097,7 +2098,7 @@ static int mxf_write_header(AVFormatContext *s)
 if (!s->nb_streams)
 return -1;
 
-if (s->oformat == _mxf_opatom_muxer && s->nb_streams !=1){
+if (s->oformat == _mxf_opatom_muxer && s->nb_streams !=1) {
 av_log(s, AV_LOG_ERROR, "there must be exactly one stream for mxf 
opatom\n");
 return -1;
 }
@@ -2212,7 +2213,7 @@ static int mxf_write_header(AVFormatContext *s)
 }
 
 spf = ff_mxf_get_samples_per_frame(s, tbc);
-if (!spf){
+if (!spf) {
 av_log(s, AV_LOG_ERROR, "Unsupported timecode frame rate 
%d/%d\n", tbc.den, tbc.num);
 return AVERROR(EINVAL);
 }
@@ -2605,7 +2606,7 @@ static int mxf_write_footer(AVFormatContext *s)
 mxf_write_random_index_pack(s);
 
 if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) {
-if (s->oformat == _mxf_opatom_muxer){
+if (s->oformat == _mxf_opatom_muxer) {
 /* rewrite body partition to

Re: [FFmpeg-devel] [PATCH 1/2] avformat/mxfenc: fix aspect ratio when writing 16:9 DV frames

2017-09-14 Thread Tomas Härdin 

On 2017-09-14 15:44, Tobias Rapp wrote:

Signed-off-by: Tobias Rapp 
---
  libavformat/mxfenc.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 7289e0b..da4d7b4 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -1810,7 +1810,7 @@ static int mxf_parse_dv_frame(AVFormatContext *s, 
AVStream *st, AVPacket *pkt)
  stype= vs_pack[3] & 0x1f;
  pal  = (vs_pack[3] >> 5) & 0x1;
  
-if ((vs_pack[2] & 0x07) == 0x02)

+if ((vsc_pack[2] & 0x07) == 0x02)
  sc->aspect_ratio = (AVRational){ 16, 9 };
  else
  sc->aspect_ratio = (AVRational){ 4, 3 };


Might want to add some { } around those two cases while you're at it

/Tomas
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 1/2] avformat/mxfenc: fix aspect ratio when writing 16:9 DV frames

2017-09-14 Thread Tobias Rapp 
Signed-off-by: Tobias Rapp 
---
 libavformat/mxfenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 7289e0b..da4d7b4 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -1810,7 +1810,7 @@ static int mxf_parse_dv_frame(AVFormatContext *s, 
AVStream *st, AVPacket *pkt)
 stype= vs_pack[3] & 0x1f;
 pal  = (vs_pack[3] >> 5) & 0x1;
 
-if ((vs_pack[2] & 0x07) == 0x02)
+if ((vsc_pack[2] & 0x07) == 0x02)
 sc->aspect_ratio = (AVRational){ 16, 9 };
 else
 sc->aspect_ratio = (AVRational){ 4, 3 };
-- 
2.7.4


___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel