From patchwork Mon Sep 19 13:25:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: erkki.seppala.ext@nokia.com X-Patchwork-Id: 637 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp1000945vsd; Mon, 19 Sep 2016 06:28:26 -0700 (PDT) X-Received: by 10.28.153.11 with SMTP id b11mr8851202wme.94.1474291706612; Mon, 19 Sep 2016 06:28:26 -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 a6si25356908wmc.16.2016.09.19.06.28.18; Mon, 19 Sep 2016 06:28:26 -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=@nokia.onmicrosoft.com; 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 dis=NONE) header.from=nokia.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0510968A078; Mon, 19 Sep 2016 16:26:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30137.outbound.protection.outlook.com [40.107.3.137]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A54E4689FA6 for ; Mon, 19 Sep 2016 16:26:00 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=FrlogD8gFQyfDlYkuMisXdD+nTK+Sx1cEnkbS+bAxOo=; b=Jo/zLSICVqG7vCYl61ni2w1DGeI+SmH+sdFwjHxLPMVDHNiXswSwPBTVZqSTPjKDaWFo8uKD+F1ymUvEXWwSR4GTCUv++jaWn+5wU6zndlzvQmhNYuNDHwp71AjaZCGGaQPJMUipMTdtLrSAMv2UNRQuHlDCEa1ZplrheXLEX8Q= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=erkki.seppala.ext@nokia.com; Received: from erkkise-laptop.vincit.intranet (131.228.2.24) by VI1PR0701MB2541.eurprd07.prod.outlook.com (10.168.139.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.629.8; Mon, 19 Sep 2016 13:26:14 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id D3DC94F0F55; Mon, 19 Sep 2016 16:25:48 +0300 (EEST) From: =?UTF-8?q?Erkki=20Sepp=C3=A4l=C3=A4?= To: Date: Mon, 19 Sep 2016 16:25:36 +0300 Message-ID: <1474291548-17810-14-git-send-email-erkki.seppala.ext@nokia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474291548-17810-1-git-send-email-erkki.seppala.ext@nokia.com> References: <1471943019-14136-1-git-send-email-erkki.seppala.ext@nokia.com> <1474291548-17810-1-git-send-email-erkki.seppala.ext@nokia.com> MIME-Version: 1.0 X-Originating-IP: [131.228.2.24] X-ClientProxiedBy: BN6PR08CA0064.namprd08.prod.outlook.com (10.172.144.26) To VI1PR0701MB2541.eurprd07.prod.outlook.com (10.168.139.142) X-MS-Office365-Filtering-Correlation-Id: fe808ae9-2ac2-4730-d79f-08d3e09087a5 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2541; 2:ZLYkhsZxJ3vx6tjQPpJikwX7Ed3PoxEhIyQcn2jY5LPzPI9CpSutLEN3R7xdZ+0El6WuZ5GrQ2Q0vQkgsWfw7SA32MHKCQFqzvv/NkTJEUBLoEqxbBq8tBbZ3ln4sBTcDUdhq9Oz02dlFHI6Q9vIJ+Fvjvm9qnO3JI+AORpCbYmv7QgtD/Fgi3LMOK0ROtSp; 3:n9tS5Fhy8Rocyz8YMAmqRjmLJCUgiVOK4LW8y0MtHz7ew4wriwRSPZnQuaJm9NbGMx4/AlpNErcCcvf7KzQqXJhDUv3KhKCAXYXctr3DHBblv0R6dSwhT5Eh0pxy/YQ2 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0701MB2541; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2541; 25:KiCGaXqTu9pHVx0a4zmjXGeqzrSr8Io9guQ6pW30JUllNfHclmBfSKVElQSh4tYlyVYcSaB6RVf2eXvIy14kAq3YgLdICaJAvy9rHPADwU95er0JzR3J+Kyv20hs6syUB1aY4H2Xamu8onEELiXIFjSDP+UX8NU2rcZ54i3Qp6oIcbqTerRgN4THzBGpANSIS+W9HrChVqhKdBFmWIC4iWrKgXYl0HstDgYLBYYy2oBH+HnIxjhf/g4wb6JI7WNOEeZqCwpUa1tph9c/QPsBbq3HDj3+fcQjB6JZsM6eCt0l6mmM0d4j73tJuqOn0hx0TkuHUvLDZ3nozz647sYb+J291YyKCdlIQ48ZYDYmFehCcDgNXvKM/hoMDVSunKxu9N6svv5+l1BzOrmuAxzCyWAPqFGUOCIfFzhPZ9g7Xe8Q97w0V1dM4rb60PGvxkzy9boxZWF60Zlmi5JjloaI/U6tXaZQXyROEMUijsZPtqvpLh8hT3Yc46Mzy+9RSMLHE//JtXEvedoK8FP3VPuvZm5eXFrXtBVX+ByygsGh2WrqEOAESdc9ywdKPxNOMSxhDsEpiADDCvMeVwVliRRxru+OnK0ECrkeckXu2hMKXNA7ThZWfbNUWOTWzVSoYuVKCQzxMIPqK1Ecp3iG/zB0/0Jzka+gHad8PAYYyJRIeDPgoy3OimizGXgL/H9m5ztGFCRs9cGwAudUje+jzEaugQ==; 31:JxdW2/3hfVk3G9/XRkp0nH3d5e2Pqp+0VE2Xp5HhZ5nC4uq0zrlrIefo//7MozID+Ul7qtWhuoJdv7CNPImXvvavLfNfcUkSbr0k2cJLXLmLuyQdO6tRcBsnPgTna+rNNGINEZMiNeQG8mjtmSXSPKkVdB8ba38S4WAwiZMOAYqXZmY90uMRRBsE8NZa+8/mcFM3habqGOA8AD9SU7U7IAkl6YnTUdvvD8GRnysYRFA= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2541; 20:tON1uVM7xMSd09oYrubMKhtX86uCadKwB5o2Gl53I31jbMSoyYm/uLOa1X8oG4YwQEQUDLAIBF/TxI1oiBxxLIgK7OeXGtAUptTJGLMpqsrMJ62z8ZudD3WxI5bAv+gjulteQzL/6/0mz3kiaoB5uYOejMmezhMYUaGGv99zds9nIdfld4IaYY9Havu/1bD3FnPdZfa3ktQAsJXFeqummvkxK6BUVJ4cUGLtEV29yR4rHI6r8cgtGDtdHvTJnkoyQZfKsdgWraX7hWP5Y9XDo++upCI25kQZ8GoAhc7q8XHBVQCCn/0cJY5EPseuXQfYwfw9AcKq47V8Fok0wHAQzOeB8YmrQ4axqpLUxiGlrIHYk+0syEABkjUQqtGtUvsTVvik8e7fY5LksYQHmVNEe+EkhQkG8261XAKyYRbjZRck2PbdeLd4njy5Ar3RAP7wfukizDKX6Ek5GA+ravu5ydXr2OLRt6UhTiG2eGEunPLMcNByTAT6ZARPngfjrMG5 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(82608151540597); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:VI1PR0701MB2541; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0701MB2541; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2541; 4:Z5kn+LraVActGHPk2db1FJX5I1NvGkNtj7h0fxrkoRYocSo9jU/Z+soo/rn+HhwCxUisCRArUcZo+q1ZW2vKa6C7dWXQb81JAKhuP/yaC4prs8VkDj20Ig1HT7gtaqmXIczNqAXbNmy20CqkOz6CIgdCsUeKiXMplMfn0v6RZCWftMt5OQVsDz/velGeiSVfGw0rh1s5fDMAKvA+tQoC4gohICLfE5Hus7M8hzOORpdxDZSn6vSzXEFU4FejUPLwf0MQPHKQrettk0RT+Vmcx/JsOoRgS0hINvGD2t0JHTVO1TNPueu5J1015NbOO/uh+Rgcq2AqA1dVBLlWmqbxZNH3LLFeJtmpkoseIixVpWqPLH7NgPQ4tNUnz3DJl+BgMT7PzbM2Sq9HEeEjXYnw4QRgHSG4oiLd5g8WFStei4Sv3PnGG3rtkXes3kfVqog/b9bQyjRtBQWldVGu+vtP5A== X-Forefront-PRVS: 0070A8666B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(7846002)(97736004)(2950100001)(305945005)(52956003)(7736002)(2870700001)(107886002)(92566002)(33646002)(50226002)(46386002)(42186005)(86362001)(36756003)(122856001)(5820100001)(8676002)(81166006)(81156014)(450100001)(189998001)(45336002)(2906002)(5660300001)(4326007)(19580405001)(105586002)(47776003)(2351001)(101416001)(76176999)(66066001)(19580395003)(586003)(68736007)(3846002)(23676002)(229853001)(50466002)(90966002)(50986999)(6116002)(110136003)(106356001)(4001430100002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0701MB2541; H:erkkise-laptop.vincit.intranet; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nokia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtWSTFQUjA3MDFNQjI1NDE7MjM6S1ltdDBwYW9Rb3I4U1U0bXZWVjhScGlD?= =?utf-8?B?bmFVYWxCcGd2VE1qcUFxV1BDbTN2UGpJN0laR0dYSWNkdTdsWDJvdFdBTkN3?= =?utf-8?B?TW96Zy9mNGoyTWtURXJDcFRhdldneHRqb0t5a2lsQS8xZFE0azhrVE9IbW82?= =?utf-8?B?N3NDb1dGbkVLeW85S0xyYVhIUzd0NTRtcUVGSU91OStjcEZXMFRYZHZzWXhr?= =?utf-8?B?YTc3cEpnd0Nod1dzYnBMNEpzSDBxRlBjd2JLRjhjeHkyZVVOT0FrVHNVTzFu?= =?utf-8?B?NVRPaUhjSnZxbmVGWjU0VktvQitONURQTGFOYXg5b3dDRlFGSW5Mb3B2WGUz?= =?utf-8?B?WTBEZnc4ampQcUIwblBkS2t2SDVCUVZiMmREeWtRUm4vNS9IeHlwUmI4YWZ5?= =?utf-8?B?cTUyenRyNW1vb0FQVEIxVnNOSVRtU0pvS0N5cFluNzBaRG9ZS1h4UzlNV0tO?= =?utf-8?B?VXdHeWdBc1piMVpCUDRQWU1hOXl6djNSaU55MlRRTEVBZzZJU2VrSXZSM2hr?= =?utf-8?B?WkZ1bmV5dWZuRmZKQjcyd3ZoVHIxSHlyd2hwMkJYT3dGN0xhVjhBWGR5MXRU?= =?utf-8?B?ZWNZMWZJZnJUOFVzQ1J3TklIc3JTZm1UdVdCN0RpMmJjSWNhSHd5WFdkaXh6?= =?utf-8?B?U3RQSm9OVzVhOEpxZCtLektxUVpzK1VVUHRSeldyc2IzejF0bzh2ZXRYNlVW?= =?utf-8?B?aVNmQzV0ZDNQanZCT01VYzZhazJaTzloNWtQSXZzK3JmaXJaQWZRSU5aeWpR?= =?utf-8?B?YTJNRCt4andTOENaQnAxM1Z6ODlSb1V6ZGNrM2VNVlpDSGdnWVdWR21OL2w1?= =?utf-8?B?TWlqazZ5N3JYd1BKaURwNEFjTm1rZVg0aTdjMzF5RXlUZUhBUlJXeWdqUG9k?= =?utf-8?B?WnpuZUNsZk1QRjBBVWRCbXh6NHMxWGt6ckxxTE54UXBmS1RFWGJDNGlTZ2FK?= =?utf-8?B?cEk4dGRsQ2lZaEZWZFJLKzYxdDNqaFdpbnZpYjk5V1lxTVBHL0NEdTVsQ3V0?= =?utf-8?B?NUxiSDBVNjVFdHNFZ1pabEJ0MXBOdEVkNkhSVVpBeDBMN1Q3Z0IzYjdlYmUr?= =?utf-8?B?MEU5SHMzdEhLKzhKMk1KL0RCRXowOWc3VThuQ3lYZ01acmIyM2k0VnlONndJ?= =?utf-8?B?NDZkVDZPUWg1Q2daUVpHNWRaQmJMdUt0T2VWWFJPWVRpZWRaWlZ6QU5YeElV?= =?utf-8?B?U1VjZlpOY255d3dUZkhqcldnemh4anFaU1IvaVVqekgyckRkUlBBNHIrTjV2?= =?utf-8?B?SElWNGxxN01WUU5nbk1EVzVIOWFFRThwY0JLM3pmQWk0MmR6cCtESFFocnhx?= =?utf-8?B?N3FpeUtrK2VtSkxxWFdaaTJkRWd4V2R3S1V4YkYrV3oyY1o4a1BoTW5yMVBp?= =?utf-8?B?VkJYeldsUS9NaHlaeTRYNGNSK0FUQkp5Z1VUWUljWEErcGV6c1BEQUdmYzdo?= =?utf-8?B?bjRWVno5cGNsRXpqejVvVWxVS0ZobmJMeFZjdWwrNFVKaXhPdm1pNEwzOXhS?= =?utf-8?B?enpoemtUK1RXMVp4ZFc4WDZGMTJKQTlnMGoybk5iNWgvRndxNUdSb0VqbitL?= =?utf-8?B?ZllhbnpyZUdJd3VmVEs5OGtjdFY5YVhWK1kzZXUxRkZ6OWcwTE02OVNSckVK?= =?utf-8?B?NVJZeXVja0ZXN1d3UzJLWnE5Yk1scEtVelFObG1ZL3pZdlB1WFNRZVdxNjFj?= =?utf-8?Q?lY9c8Lj8e0TK1Dk2jpqJGhCn5c0tnyn1mASDTZSFY?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2541; 6:hJoTO3vqWLmTmpfQQLKxJ85MkdReF1g4LdyRw2vDPPHwq0HpKULPlWx3b+lGw77z/SF0wLO/sTiLcgHIMb1ggCBSjdk6UoaBvD407sli9pSgzhJ0bmzClqejfjeeh47MAGvTcOIO/knUjm3w26YcRE7DvxFH7LHAJKfPHnDn1xIhU8lwHob9eDtT2jhS0q/tKyqjZDIaimoA00i3n/zr5D47xDimQFOKIcYEZaKY90UDLsDUmh2QUMEp0Z8WTSpZC7JUhaI1eLAN9IJWfXsRQWSnzmHTQ7fvN1z70zJf3camvTNrF4M/TzTtPBTmKO/mGeIVfdGFKuJn24HCX9gh0g==; 5:0E2RjHIWzwOrrpCU3NjX2lyN8kOpKqo9zBgPUnnB6t1+psKzuTsdJ7gPQvPh1LZs78k1eo050FjFYTlzj0Sl+xN0wnduDny3Pjt+9+CGj0RPhQWNh80gMCJ33F6SGJ7vLBKSeOSADe6nK7rZmSmwvA==; 24:SavpT1hlB8JSk5QehUEELRTnU7J1WiyKfdUyxd+A/EakPuYS36a8Vl8Y7y1Jv7fx7dvWflNPNaI3Uom0cxY54TRfcbAn8mpTxXmr1rWaK14=; 7:UnQs885qlSgF3xcJGPHQmRcyWOzjtYoBrV5QcFBwzVTUhhXWSLuvJ7emXTMl2U+RLBFDchHDwhfZc2ZWY8/PF41JajVUwnAyJScuvenq4duepCXYaiG/gRhvLyYqFuqJ/XTFFEbQuBcyR5pj1faCPTUClXg6su0KtQ+Ezx9HWsrdZ5ETW2dpr0uy8pC0NGT0+z1H7pPeaghleV9zBXNIJndpKO52EzSEX/N0a33TpIUsxZL2k5xzbfVVFeYT3Xiob7N+NQAnO9RedxUvPF5hLOQBz+uP1+yGah83j/be0X0XqlLEyKcLCdtLjZsF1tgY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2016 13:26:14.2875 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0701MB2541 Subject: [FFmpeg-devel] [PATCH v3 13/25] avcodec/utils: do_decode now supports AVMEDIA_TYPE_DATA X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: =?UTF-8?q?Erkki=20Sepp=C3=A4l=C3=A4?= , OZOPlayer Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This allows using avcodec_send_packet with data frames (ie. timed metadata) Signed-off-by: Erkki Seppälä Signed-off-by: OZOPlayer --- libavcodec/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 138125a..8b55464 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2737,6 +2737,10 @@ static int do_decode(AVCodecContext *avctx, AVPacket *pkt) } else if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) { ret = avcodec_decode_audio4(avctx, avctx->internal->buffer_frame, &got_frame, pkt); + } else if (avctx->codec_type == AVMEDIA_TYPE_DATA) { + ret = avctx->codec->decode(avctx, avctx->internal->buffer_frame, &got_frame, pkt); + if (ret == 0 && got_frame) + ret = pkt->size; } else { ret = AVERROR(EINVAL); }