RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 01:42:20 +00:00
Code Issues Projects Releases Wiki Activity

avformat/dvdvideodec: add CLUT utilities and subtitle color support

Browse Source 
Signed-off-by: Marth64 <marth64@proxyid.net>
This commit is contained in:
Marth64 2024-03-09 12:27:51 -06:00 committed by Stefano Sabatini
parent 75dd083904
commit b8cbaad2ac
4 changed files with 127 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@ -194,7 +194,7 @@ OBJS-$(CONFIG_DTS_MUXER) += rawenc.o
OBJS-$(CONFIG_DV_MUXER) += dvenc.o
OBJS-$(CONFIG_DVBSUB_DEMUXER) += dvbsub.o rawdec.o
OBJS-$(CONFIG_DVBTXT_DEMUXER) += dvbtxt.o rawdec.o
OBJS-$(CONFIG_DVDVIDEO_DEMUXER) += dvdvideodec.o
OBJS-$(CONFIG_DVDVIDEO_DEMUXER) += dvdvideodec.o dvdclut.o
OBJS-$(CONFIG_DXA_DEMUXER) += dxa.o
OBJS-$(CONFIG_EA_CDATA_DEMUXER) += eacdata.o
OBJS-$(CONFIG_EA_DEMUXER) += electronicarts.o

75
libavformat/dvdclut.c Normal file
View File

@ -0,0 +1,75 @@
/*
* DVD-Video subpicture CLUT (Color Lookup Table) utilities
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/bprint.h"
#include "libavutil/colorspace.h"
#include "libavutil/common.h"
#include "dvdclut.h"
#include "internal.h"
int ff_dvdclut_palette_extradata_cat(const uint32_t *clut,
const size_t clut_size,
AVCodecParameters *par)
{
AVBPrint bp;
if (clut_size != FF_DVDCLUT_CLUT_SIZE)
return AVERROR(EINVAL);
av_bprint_init(&bp, 0, FF_DVDCLUT_EXTRADATA_SIZE);
av_bprintf(&bp, "palette: ");
for (int i = 0; i < FF_DVDCLUT_CLUT_LEN; i++)
av_bprintf(&bp, "%06"PRIx32"%s", clut[i],
i != (FF_DVDCLUT_CLUT_LEN - 1) ? ", " : "");
av_bprintf(&bp, "\n");
return ff_bprint_to_codecpar_extradata(par, &bp);
}
int ff_dvdclut_yuv_to_rgb(uint32_t *clut, const size_t clut_size)
{
int y, cb, cr;
uint8_t r, g, b;
int r_add, g_add, b_add;
if (clut_size != FF_DVDCLUT_CLUT_SIZE)
return AVERROR(EINVAL);
for (int i = 0; i < FF_DVDCLUT_CLUT_LEN; i++) {
y = (clut[i] >> 16) & 0xFF;
cr = (clut[i] >> 8) & 0xFF;
cb = clut[i] & 0xFF;
YUV_TO_RGB1_CCIR(cb, cr);
y = (y - 16) * FIX(255.0 / 219.0);
r = av_clip_uint8((y + r_add - 1024) >> SCALEBITS);
g = av_clip_uint8((y + g_add - 1024) >> SCALEBITS);
b = av_clip_uint8((y + b_add - 1024) >> SCALEBITS);
clut[i] = (r << 16) | (g << 8) | b;
}
return 0;
}

37
libavformat/dvdclut.h Normal file
View File

@ -0,0 +1,37 @@
/*
* DVD-Video subpicture CLUT (Color Lookup Table) utilities
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVFORMAT_DVDCLUT_H
#define AVFORMAT_DVDCLUT_H
#include "libavcodec/codec_par.h"
/* ("palette: ") + ("rrggbb, "*15) + ("rrggbb") + \n + \0 */
#define FF_DVDCLUT_EXTRADATA_SIZE (9 + (8 * 15) + 6 + 1 + 1)
#define FF_DVDCLUT_CLUT_LEN 16
#define FF_DVDCLUT_CLUT_SIZE FF_DVDCLUT_CLUT_LEN * sizeof(uint32_t)
int ff_dvdclut_palette_extradata_cat(const uint32_t *clut,
const size_t clut_size,
AVCodecParameters *par);
int ff_dvdclut_yuv_to_rgb(uint32_t *clut, const size_t clut_size);
#endif /* AVFORMAT_DVDCLUT_H */

14
libavformat/dvdvideodec.c
View File

@ -49,6 +49,7 @@
#include "avio_internal.h"
#include "avlanguage.h"
#include "demux.h"
#include "dvdclut.h"
#include "internal.h"
#include "url.h"
@ -95,6 +96,7 @@ typedef struct DVDVideoPGCSubtitleStreamEntry {
int startcode;
enum DVDVideoSubpictureViewport viewport;
int disposition;
uint32_t clut[FF_DVDCLUT_CLUT_LEN];
const char *lang_iso;
} DVDVideoPGCSubtitleStreamEntry;
@ -1040,6 +1042,8 @@ break_error:
static int dvdvideo_subp_stream_analyze(AVFormatContext *s, uint32_t offset, subp_attr_t subp_attr,
DVDVideoPGCSubtitleStreamEntry *entry)
{
DVDVideoDemuxContext *c = s->priv_data;
char lang_dvd[3] = {0};
entry->startcode = 0x20 + (offset & 0x1F);
@ -1047,6 +1051,12 @@ static int dvdvideo_subp_stream_analyze(AVFormatContext *s, uint32_t offset, sub
if (subp_attr.lang_extension == 9)
entry->disposition |= AV_DISPOSITION_FORCED;
memcpy(&entry->clut, c->play_state.pgc->palette, FF_DVDCLUT_CLUT_SIZE);
/* dvdsub palettes currently have no colorspace tagging and all muxers only support RGB */
/* this is not a lossless conversion, but no use cases are supported for the original YUV */
ff_dvdclut_yuv_to_rgb(entry->clut, FF_DVDCLUT_CLUT_SIZE);
AV_WB16(lang_dvd, subp_attr.lang_code);
entry->lang_iso = ff_convert_lang_to(lang_dvd, AV_LANG_ISO639_2_BIBL);
@ -1058,6 +1068,7 @@ static int dvdvideo_subp_stream_add(AVFormatContext *s, DVDVideoPGCSubtitleStrea
{
AVStream *st;
FFStream *sti;
int ret;
st = avformat_new_stream(s, NULL);
if (!st)
@ -1067,6 +1078,9 @@ static int dvdvideo_subp_stream_add(AVFormatContext *s, DVDVideoPGCSubtitleStrea
st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
st->codecpar->codec_id = AV_CODEC_ID_DVD_SUBTITLE;
if ((ret = ff_dvdclut_palette_extradata_cat(entry->clut, FF_DVDCLUT_CLUT_SIZE, st->codecpar)) < 0)
return ret;
if (entry->lang_iso)
av_dict_set(&st->metadata, "language", entry->lang_iso, 0);