From patchwork Sat Sep 18 03:52:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30345 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2791424iov; Fri, 17 Sep 2021 20:52:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOUnTXkN2hHT7AtJMvwB2Ned0pPWzHOIBCCr8txPj+ZMaYHmpyJFqvP0xnTnCXEFjC3L4b X-Received: by 2002:a17:906:9395:: with SMTP id l21mr15999550ejx.308.1631937179490; Fri, 17 Sep 2021 20:52:59 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v30si8823527ejk.261.2021.09.17.20.52.59; Fri, 17 Sep 2021 20:52:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=qTRXDtIL; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2AB9F68B1CB; Sat, 18 Sep 2021 06:52:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11olkn2015.outbound.protection.outlook.com [40.92.18.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F242C68B1BD for ; Sat, 18 Sep 2021 06:52:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=grV7rzWponXxABckQjlWuvZKwyJJM5opj6iIHdEyzDQ2NuJ795Fj/sM11Bl9njzI0vxipE6CrWaa+bdvs6lY7wWGn3Eg7s2jPYYa5JczLtm8Via7imPbYGALSMVDcsetN5ZuhfoHGUPE8LXtK311vtMX9uV+mfbdD2tfJkvY/FA0Ec9kLc9jyGBVkaT0sPHOkEDSmusZrE9mZ8MIYgfRccR0K3JX7KFPR+L+9NYlFbsQxybUWoKrazvSnagRfrjPCZCAsz/k+gkfo9N2tNZ4jKDE1AURGdfLtt5Ic+e1/Wx2FKUAtmxn0EAJQO4CuYtGjCxIGKZJ0gVfK4FB1LJJ2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Kw0n43sOF/IOlPb4RDjDtEtt845l3X0fM6mQhVt4t90=; b=XbCKkNN6iWafvC6XLIf1h9e8tYQ+LritcSRh2XpB9CePN4lHWniJwc+BSwRj9UMW9r5eqxwDL/8WVlUPW/L15CKDtaWSFQwnsUUrhDu6AUNz+/aC9kSKCBJwpdhjnFGlu9g/DpWlZOaMa3vfBeTO+X5NYFxbxs019Wv/mxX88ksyQmsD5mYeRO3jDvT8HveeunjtmeZUoeu39W1LYvKXyw1/cuJEnKFkr+v/fip1b5hdEdllnqcG6TAQ58+0332cTsYTRl64kyz3G02OmBXazt8S5kGbo4kqKqf4ZiHwTezco6L2EULXn/J8iET2yEbuLsgkAxuyg/RrJTL1Ybx+rA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Kw0n43sOF/IOlPb4RDjDtEtt845l3X0fM6mQhVt4t90=; b=qTRXDtILnVDoV0fSltsYmVP35oP8qW0arIWi90zX7fYaADsVo7bkdB5TadcyPQ/7vbc15GwAR2wpyyjF/N1T2BpSEtc/WNV7oRhWg3bpbfw9879SmxsBZ6gZKE0m6cjl0t669XaX2UekgZtT+Mn8m32YGrr0xwpQsT+iCADa/BEu6KZZlad2TCmjwJnrsOB38Ll0onI5cexuud/qFTXmTl4FDseVo+ePkZuVhH/szS3MCTf3LFMEHwefAiHY7LMZbV/JSrBQL65F+iIol9xtoPmjwgXJOquQSBvgDOIrZQ4/rp2pBEJ6F6T1fMS/U+0m+Fb4crv/eJEnhXMEbkJGWQ== Received: from BYAPR04MB5976.namprd04.prod.outlook.com (2603:10b6:a03:f2::32) by BY5PR04MB6865.namprd04.prod.outlook.com (2603:10b6:a03:219::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.16; Sat, 18 Sep 2021 03:52:44 +0000 Received: from BYAPR04MB5976.namprd04.prod.outlook.com ([fe80::ecc6:937b:3740:1816]) by BYAPR04MB5976.namprd04.prod.outlook.com ([fe80::ecc6:937b:3740:1816%6]) with mapi id 15.20.4523.015; Sat, 18 Sep 2021 03:52:43 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v7 02/12] fftools/play, probe: Adjust for subtitle changes Thread-Index: AQHXrECi8zQGQaph0kSojJeoS1FnmQ== Date: Sat, 18 Sep 2021 03:52:43 +0000 Message-ID: References: <0929c32d8c695549bb9848e24113a07810118645.1631934103.git.softworkz@hotmail.com> In-Reply-To: <0929c32d8c695549bb9848e24113a07810118645.1631934103.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [SPgsprDAPnUA3JwsV1PO/Pv6vZ5kG0Nx] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 04862b8c-6d31-4c7e-a350-08d97a57c53a x-ms-traffictypediagnostic: BY5PR04MB6865: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: orP0IJQNud2UaAd6AZZoj5drmUNzkct7V4EPwamMF4QLsKAl03Bvr8sNdGkxZOABUUp4iOgi7oCW2bE72Tg8mwe7ddx8e6F6c6F1MEYTW3Lx+yxdeBSsStY2INuD1i7mFS4KQsi7MRoNZBjSI28AlbyNur379XIRzm54UZQA3EIvEsosDlePIWlrwUwE+mhnJdUwG/42xF9DmNoDJnlvE7GrsCpwwPwUmV3YheeyhY5rbowQG9M0ZUtNm8t3xb8tt/soxFhM3AABPvnkEKKW9Uzy5ZqJG9pO4xEYloW2PjIEm2QwZakVIKz3wW6kxtn9mEI+BuKKiyBWIaBCHbZdywgSbM/lJACYgzE7vDEESw2CPGOLFIO+hRKVezY951VgbiVaqtlAozim+Q00QLJLL5w2JuN79hXEvhxw8FYVxL/kHdXKLWLI99G6c2e1Fy6G x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: fNqM8IFXIYVMt+mq5NOUkxzSrdKdAfHwPoOPgduANoxtELvLe2F/ibt05OmbwQzqMXQujPR8Gqhl9EtwEIV7GRJlsZEZOlOOfK9o+GxwKqfEFEax0fmrliwUahMxendCE3EYHe+9sx4sqH56hu7wJA== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR04MB5976.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 04862b8c-6d31-4c7e-a350-08d97a57c53a X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Sep 2021 03:52:43.8504 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR04MB6865 Subject: [FFmpeg-devel] [PATCH v7 02/12] fftools/play, probe: Adjust for subtitle changes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3oUtZvUBWTDX Signed-off-by: softworkz --- fftools/ffplay.c | 50 +++++++++++++++++++++++------------------------ fftools/ffprobe.c | 49 ++++++++++++++++++++++++++++++++++------------ 2 files changed, 62 insertions(+), 37 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index ccea0e4578..08e5d53f9c 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -152,7 +152,6 @@ typedef struct Clock { /* Common struct for handling all types of decoded data and allocated render buffers. */ typedef struct Frame { AVFrame *frame; - AVSubtitle sub; int serial; double pts; /* presentation timestamp for the frame */ double duration; /* estimated duration of the frame */ @@ -586,7 +585,7 @@ static int decoder_init(Decoder *d, AVCodecContext *avctx, PacketQueue *queue, S return 0; } -static int decoder_decode_frame(Decoder *d, AVFrame *frame, AVSubtitle *sub) { +static int decoder_decode_frame(Decoder *d, AVFrame *frame) { int ret = AVERROR(EAGAIN); for (;;) { @@ -654,7 +653,7 @@ static int decoder_decode_frame(Decoder *d, AVFrame *frame, AVSubtitle *sub) { if (d->avctx->codec_type == AVMEDIA_TYPE_SUBTITLE) { int got_frame = 0; - ret = avcodec_decode_subtitle2(d->avctx, sub, &got_frame, d->pkt); + ret = avcodec_decode_subtitle3(d->avctx, frame, &got_frame, d->pkt); if (ret < 0) { ret = AVERROR(EAGAIN); } else { @@ -683,7 +682,6 @@ static void decoder_destroy(Decoder *d) { static void frame_queue_unref_item(Frame *vp) { av_frame_unref(vp->frame); - avsubtitle_free(&vp->sub); } static int frame_queue_init(FrameQueue *f, PacketQueue *pktq, int max_size, int keep_last) @@ -981,7 +979,7 @@ static void video_image_display(VideoState *is) if (frame_queue_nb_remaining(&is->subpq) > 0) { sp = frame_queue_peek(&is->subpq); - if (vp->pts >= sp->pts + ((float) sp->sub.start_display_time / 1000)) { + if (vp->pts >= sp->pts + ((float) sp->frame->subtitle_start_time / 1000)) { if (!sp->uploaded) { uint8_t* pixels[4]; int pitch[4]; @@ -993,8 +991,8 @@ static void video_image_display(VideoState *is) if (realloc_texture(&is->sub_texture, SDL_PIXELFORMAT_ARGB8888, sp->width, sp->height, SDL_BLENDMODE_BLEND, 1) < 0) return; - for (i = 0; i < sp->sub.num_rects; i++) { - AVSubtitleRect *sub_rect = sp->sub.rects[i]; + for (i = 0; i < sp->frame->num_subtitle_areas; i++) { + AVSubtitleArea *sub_rect = sp->frame->subtitle_areas[i]; sub_rect->x = av_clip(sub_rect->x, 0, sp->width ); sub_rect->y = av_clip(sub_rect->y, 0, sp->height); @@ -1041,13 +1039,15 @@ static void video_image_display(VideoState *is) int i; double xratio = (double)rect.w / (double)sp->width; double yratio = (double)rect.h / (double)sp->height; - for (i = 0; i < sp->sub.num_rects; i++) { - SDL_Rect *sub_rect = (SDL_Rect*)sp->sub.rects[i]; - SDL_Rect target = {.x = rect.x + sub_rect->x * xratio, - .y = rect.y + sub_rect->y * yratio, - .w = sub_rect->w * xratio, - .h = sub_rect->h * yratio}; - SDL_RenderCopy(renderer, is->sub_texture, sub_rect, &target); + for (i = 0; i < sp->frame->num_subtitle_areas; i++) { + AVSubtitleArea *area = sp->frame->subtitle_areas[i]; + SDL_Rect sub_rect = { .x = area->x, .y = area->y, + .w = area->w, .h = area->h}; + SDL_Rect target = {.x = rect.x + sub_rect.x * xratio, + .y = rect.y + sub_rect.y * yratio, + .w = sub_rect.w * xratio, + .h = sub_rect.h * yratio}; + SDL_RenderCopy(renderer, is->sub_texture, &sub_rect, &target); } #endif } @@ -1651,13 +1651,13 @@ retry: sp2 = NULL; if (sp->serial != is->subtitleq.serial - || (is->vidclk.pts > (sp->pts + ((float) sp->sub.end_display_time / 1000))) - || (sp2 && is->vidclk.pts > (sp2->pts + ((float) sp2->sub.start_display_time / 1000)))) + || (is->vidclk.pts > (sp->pts + ((float) sp->frame->subtitle_end_time / 1000))) + || (sp2 && is->vidclk.pts > (sp2->pts + ((float) sp2->frame->subtitle_start_time / 1000)))) { if (sp->uploaded) { int i; - for (i = 0; i < sp->sub.num_rects; i++) { - AVSubtitleRect *sub_rect = sp->sub.rects[i]; + for (i = 0; i < sp->frame->num_subtitle_areas; i++) { + AVSubtitleRect *sub_rect = sp->frame->subtitle_areas[i]; uint8_t *pixels; int pitch, j; @@ -1774,7 +1774,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame) { int got_picture; - if ((got_picture = decoder_decode_frame(&is->viddec, frame, NULL)) < 0) + if ((got_picture = decoder_decode_frame(&is->viddec, frame)) < 0) return -1; if (got_picture) { @@ -2048,7 +2048,7 @@ static int audio_thread(void *arg) return AVERROR(ENOMEM); do { - if ((got_frame = decoder_decode_frame(&is->auddec, frame, NULL)) < 0) + if ((got_frame = decoder_decode_frame(&is->auddec, frame)) < 0) goto the_end; if (got_frame) { @@ -2246,14 +2246,14 @@ static int subtitle_thread(void *arg) if (!(sp = frame_queue_peek_writable(&is->subpq))) return 0; - if ((got_subtitle = decoder_decode_frame(&is->subdec, NULL, &sp->sub)) < 0) + if ((got_subtitle = decoder_decode_frame(&is->subdec, sp->frame)) < 0) break; pts = 0; - if (got_subtitle && sp->sub.format == 0) { - if (sp->sub.pts != AV_NOPTS_VALUE) - pts = sp->sub.pts / (double)AV_TIME_BASE; + if (got_subtitle && sp->frame->format == AV_SUBTITLE_FMT_BITMAP) { + if (sp->frame->subtitle_pts != AV_NOPTS_VALUE) + pts = sp->frame->subtitle_pts / (double)AV_TIME_BASE; sp->pts = pts; sp->serial = is->subdec.pkt_serial; sp->width = is->subdec.avctx->width; @@ -2263,7 +2263,7 @@ static int subtitle_thread(void *arg) /* now we can update the picture count */ frame_queue_push(&is->subpq); } else if (got_subtitle) { - avsubtitle_free(&sp->sub); + av_frame_free(&sp->frame); } } return 0; diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index d8e968321e..880f05a6c2 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2208,22 +2208,43 @@ static void show_packet(WriterContext *w, InputFile *ifile, AVPacket *pkt, int p fflush(stdout); } -static void show_subtitle(WriterContext *w, AVSubtitle *sub, AVStream *stream, +static void show_subtitle(WriterContext *w, AVFrame *sub, AVStream *stream, AVFormatContext *fmt_ctx) { AVBPrint pbuf; + const char *s; av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED); writer_print_section_header(w, SECTION_ID_SUBTITLE); print_str ("media_type", "subtitle"); - print_ts ("pts", sub->pts); - print_time("pts_time", sub->pts, &AV_TIME_BASE_Q); - print_int ("format", sub->format); - print_int ("start_display_time", sub->start_display_time); - print_int ("end_display_time", sub->end_display_time); - print_int ("num_rects", sub->num_rects); + print_ts ("pts", sub->subtitle_pts); + print_time("pts_time", sub->subtitle_pts, &AV_TIME_BASE_Q); + + // Remain compatible with previous outputs + switch (sub->format) { + case AV_SUBTITLE_FMT_BITMAP: + print_int ("format", 0); + break; + case AV_SUBTITLE_FMT_TEXT: + print_int ("format", 1); + break; + case AV_SUBTITLE_FMT_ASS: + print_int ("format", 1); + break; + default: + print_int ("format", -1); + break; + } + + s = av_get_subtitle_fmt_name(sub->format); + if (s) print_str ("format_str", s); + else print_str_opt("format_str", "unknown"); + + print_int ("start_display_time", sub->subtitle_start_time); + print_int ("end_display_time", sub->subtitle_end_time); + print_int ("num_subtitle_rects", sub->num_subtitle_areas); writer_print_section_footer(w); @@ -2388,7 +2409,7 @@ static av_always_inline int process_frame(WriterContext *w, AVFormatContext *fmt_ctx = ifile->fmt_ctx; AVCodecContext *dec_ctx = ifile->streams[pkt->stream_index].dec_ctx; AVCodecParameters *par = ifile->streams[pkt->stream_index].st->codecpar; - AVSubtitle sub; + AVFrame *sub = NULL; int ret = 0, got_frame = 0; clear_log(1); @@ -2416,8 +2437,12 @@ static av_always_inline int process_frame(WriterContext *w, break; case AVMEDIA_TYPE_SUBTITLE: - if (*packet_new) - ret = avcodec_decode_subtitle2(dec_ctx, &sub, &got_frame, pkt); + if (*packet_new) { + sub = av_frame_alloc(); + if (!sub) + return AVERROR(ENOMEM); + ret = avcodec_decode_subtitle3(dec_ctx, sub, &got_frame, pkt); + } *packet_new = 0; break; default: @@ -2434,11 +2459,11 @@ static av_always_inline int process_frame(WriterContext *w, nb_streams_frames[pkt->stream_index]++; if (do_show_frames) if (is_sub) - show_subtitle(w, &sub, ifile->streams[pkt->stream_index].st, fmt_ctx); + show_subtitle(w, sub, ifile->streams[pkt->stream_index].st, fmt_ctx); else show_frame(w, frame, ifile->streams[pkt->stream_index].st, fmt_ctx); if (is_sub) - avsubtitle_free(&sub); + av_frame_free(&sub); } return got_frame || *packet_new; }