Message ID | 20190809012919.18802-1-rzumer@tebako.net |
---|---|
State | Superseded |
Headers | show |
On Fri, Aug 9, 2019 at 3:29 AM <rzumer@tebako.net> wrote: > From: Raphaël Zumer <rzumer@tebako.net> > > This is an alias for JEDEC P22. > > The name associated with the value is also changed > from "jedec-p22" to "ebu3213" to match ITU-T H.273. > > Signed-off-by: Raphaël Zumer <rzumer@tebako.net> > --- > doc/APIchanges | 3 +++ > libavutil/pixdesc.c | 2 +- > libavutil/pixfmt.h | 1 + > libavutil/version.h | 2 +- > 4 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/doc/APIchanges b/doc/APIchanges > index 6603a8229e..f71b0c4a75 100644 > --- a/doc/APIchanges > +++ b/doc/APIchanges > @@ -15,6 +15,9 @@ libavutil: 2017-10-21 > > API changes, most recent first: > > +2019-08-08 - xxxxxxxxxx - lavu 56.34.100 - pixfmt.h > + Add EBU Tech. 3213-E AVColorPrimaries value > this value was already present, this is just a rename > + > 2019-07-27 - xxxxxxxxxx - lavu 56.33.100 - tx.h > Add AV_TX_DOUBLE_FFT and AV_TX_DOUBLE_MDCT > > diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c > index b97b0665b0..3b2d3b3123 100644 > --- a/libavutil/pixdesc.c > +++ b/libavutil/pixdesc.c > @@ -2369,7 +2369,7 @@ static const char * const > color_primaries_names[AVCOL_PRI_NB] = { > [AVCOL_PRI_SMPTE428] = "smpte428", > [AVCOL_PRI_SMPTE431] = "smpte431", > [AVCOL_PRI_SMPTE432] = "smpte432", > - [AVCOL_PRI_JEDEC_P22] = "jedec-p22", > + [AVCOL_PRI_JEDEC_P22] = "ebu3213", > }; > > static const char * const color_transfer_names[] = { > diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h > index 8b54c9415b..7f7b537721 100644 > --- a/libavutil/pixfmt.h > +++ b/libavutil/pixfmt.h > @@ -457,6 +457,7 @@ enum AVColorPrimaries { > AVCOL_PRI_SMPTE431 = 11, ///< SMPTE ST 431-2 (2011) / DCI P3 > AVCOL_PRI_SMPTE432 = 12, ///< SMPTE ST 432-1 (2010) / P3 D65 / > Display P3 > AVCOL_PRI_JEDEC_P22 = 22, ///< JEDEC P22 phosphors > + AVCOL_PRI_EBU3213 = AVCOL_PRI_JEDEC_P22, > I'd do the opposite, similarly to what is done for AVCOL_PRI_SMPTEST428_1 AVCOL_PRI_EBU3213 = 22, ///< JEDEC P22 phosphors, EBU Tech 3213 E AVCOL_PRI_JEDEC_P22 = AVCOL_PRI_EBU3213, AVCOL_PRI_NB ///< Not part of ABI > }; > > -- Vittorio
On 2019-08-09 7:51 a.m., Vittorio Giovara wrote: > this value was already present, this is just a rename I think it counts as a new enum value (variant), even though it aliases another. I initially wrote "rename", but reworded the commit message based on James Almer's comment: > The subject should be something like "avutil/pixfmt: > Add EBU Tech. 3213-E AVColorPrimaries value" > I'd do the opposite, similarly to what is done for AVCOL_PRI_SMPTEST428_1 > > AVCOL_PRI_EBU3213 = 22, ///< JEDEC P22 phosphors, EBU Tech 3213 E > AVCOL_PRI_JEDEC_P22 = AVCOL_PRI_EBU3213, > > AVCOL_PRI_NB ///< Not part of ABI > }; Will do. I will also replace internal usage of JEDEC_P22 with EBU3213 elsewhere. I just noticed I missed the same comment (and a few others) in JA's review earlier, sorry about that. Will apply all corrections in my next revision.
diff --git a/doc/APIchanges b/doc/APIchanges index 6603a8229e..f71b0c4a75 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2019-08-08 - xxxxxxxxxx - lavu 56.34.100 - pixfmt.h + Add EBU Tech. 3213-E AVColorPrimaries value + 2019-07-27 - xxxxxxxxxx - lavu 56.33.100 - tx.h Add AV_TX_DOUBLE_FFT and AV_TX_DOUBLE_MDCT diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index b97b0665b0..3b2d3b3123 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2369,7 +2369,7 @@ static const char * const color_primaries_names[AVCOL_PRI_NB] = { [AVCOL_PRI_SMPTE428] = "smpte428", [AVCOL_PRI_SMPTE431] = "smpte431", [AVCOL_PRI_SMPTE432] = "smpte432", - [AVCOL_PRI_JEDEC_P22] = "jedec-p22", + [AVCOL_PRI_JEDEC_P22] = "ebu3213", }; static const char * const color_transfer_names[] = { diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 8b54c9415b..7f7b537721 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -457,6 +457,7 @@ enum AVColorPrimaries { AVCOL_PRI_SMPTE431 = 11, ///< SMPTE ST 431-2 (2011) / DCI P3 AVCOL_PRI_SMPTE432 = 12, ///< SMPTE ST 432-1 (2010) / P3 D65 / Display P3 AVCOL_PRI_JEDEC_P22 = 22, ///< JEDEC P22 phosphors + AVCOL_PRI_EBU3213 = AVCOL_PRI_JEDEC_P22, AVCOL_PRI_NB ///< Not part of ABI }; diff --git a/libavutil/version.h b/libavutil/version.h index ecc6a7c9e2..658a508284 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 56 -#define LIBAVUTIL_VERSION_MINOR 33 +#define LIBAVUTIL_VERSION_MINOR 34 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \