[FFmpeg-devel] [PATCH 2/2] avformat/mxfenc: Set horizontal chroma subsample value from pixel format if available

[Michael Niedermayer]

On Mon, May 18, 2015 at 09:36:17AM +0100, tim nicholson wrote:
> On 16/05/15 19:18, Michael Niedermayer wrote:
> > Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> > ---
> >  libavformat/mxfenc.c |    7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> > 
> > diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
> > index 14449c9..659c34f 100644
> > --- a/libavformat/mxfenc.c
> > +++ b/libavformat/mxfenc.c
> > @@ -79,6 +79,7 @@ typedef struct MXFStreamContext {
> >      int interlaced;          ///< whether picture is interlaced
> >      int field_dominance;     ///< tff=1, bff=2
> >      int component_depth;
> > +    int h_chroma_sub_sample;
> >      int temporal_reordering;
> >      AVRational aspect_ratio; ///< display aspect ratio
> >      int closed_gop;          ///< gop is closed, used in mpeg-2 frame parsing
> > @@ -1027,7 +1028,7 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke
> >  
> >      // horizontal subsampling
> >      mxf_write_local_tag(pb, 4, 0x3302);
> > -    avio_wb32(pb, 2);
> > +    avio_wb32(pb, sc->h_chroma_sub_sample);
> >  
> >      // frame layout
> >      mxf_write_local_tag(pb, 1, 0x320C);
> > @@ -2035,9 +2036,11 @@ static int mxf_write_header(AVFormatContext *s)
> >              AVRational rate, tbc = st->time_base;
> >              // Default component depth to 8
> >              sc->component_depth = 8;
> > +            sc->h_chroma_sub_sample = 2;
> >  
> >              if (pix_desc) {
> > -                sc->component_depth = pix_desc->comp[0].depth_minus1 + 1;
> > +                sc->component_depth     = pix_desc->comp[0].depth_minus1 + 1;
> > +                sc->h_chroma_sub_sample = 1 << pix_desc->log2_chroma_w;
> >              }
> >  
> >              mxf->timecode_base = (tbc.den + tbc.num/2) / tbc.num;
> > 
> 
> LGTM

applied

thanks

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

Breaking DRM is a little like attempting to break through a door even
though the window is wide open and the only thing in the house is a bunch
of things you dont want and which you would get tomorrow for free anyway
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150518/54ac0092/attachment.asc>