Commit 6ad64e3d authored by Alexandre Janniaux's avatar Alexandre Janniaux Committed by Soomin Lee

transcode: fix transcode with passthrough video

Fix transcode pipeline when using passthrough for the video track, for
example when using chromecast which doesn't try to convert the video
track.

Thus, it also fixes the playback of correct h264 stream on chromecast.

This was a regression from 553a5da7
due to patch transcode-add-support-for-multiple-venc-parameters.
parent 5a3d1286
From b6030e9ee856e0c0c7d32013bb50039b8f351958 Mon Sep 17 00:00:00 2001
From a764311815c302e77f87ce1ddb924a8e760bef84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 18 Dec 2014 22:14:55 +0100
Subject: [PATCH 01/26] arm_neon: work-around libtool issue
......
From 19f526d3536082a60d80bb16f939022e6a7ce11b Mon Sep 17 00:00:00 2001
From e9c1dc8bb9bc5180e6dbafd9dda01c756fc67910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 10 Dec 2014 22:14:55 +0100
Subject: [PATCH 02/26] disable neon volume plugin
......
From 6c4f6e3c1efd5328fd93ec8672f7458b65dbe13a Mon Sep 17 00:00:00 2001
From cb41d7ce870dc034cc20a4771fcb2c28b1e30804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 22 Jul 2016 11:11:44 +0200
Subject: [PATCH 03/26] Enable System DL
......
From c3c3e7042928d8010a4d79f712a4290363b17e83 Mon Sep 17 00:00:00 2001
From ecc3193e0021a5902229580520358365dc9817f9 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:10 +0200
Subject: [PATCH 04/26] http: add vlc_http_cookies_clear
......
From 362bf929366f8509b90ae993660235063e71af3d Mon Sep 17 00:00:00 2001
From 1c93273b8fa98c73928bef678cb3dc920345e174 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:11 +0200
Subject: [PATCH 05/26] libvlc_media: add cookie_jar API
......
From c7149b86a9e2bfc57b379d0504423bd4d3f6bc6f Mon Sep 17 00:00:00 2001
From 35debff709b8ca38de9febc7cbe4fec8993009fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 7 Dec 2014 20:02:18 +0100
Subject: [PATCH 06/26] contrib/gcrypt: work-around a libtool limitation
......
From c4e5d1100d4bfb08987a3a7acf8c9d930dabc69a Mon Sep 17 00:00:00 2001
From d642b417483ca2ea1aaa74bf5c535ae3516665c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sat, 3 Oct 2015 22:45:14 +0200
Subject: [PATCH 07/26] contrib/gcrypt: fix tvOS compilation
......
From a9489bbb6df37ea64b9f9e20273d86ee6c349ff0 Mon Sep 17 00:00:00 2001
From c2439751018d4181571ac915c49b847192d7f627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 12 Sep 2016 17:03:37 +0200
Subject: [PATCH 08/26] contrib/gcrypt: update patches
......
From 7ee8e58a29f6647cef0b245b3b30a2d33fb6ee83 Mon Sep 17 00:00:00 2001
From 2b9087215fe11e22b4e29369cedca7579ac605bc Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Mon, 17 Jul 2017 17:03:24 +0200
Subject: [PATCH 09/26] Replace thread local with pthread TSD
......
From a4ef75d797aeefa0a8b0ccc6b37220fa97efc6ac Mon Sep 17 00:00:00 2001
From 2ab5334086120fdff9e6e142e9a3c5f28692b062 Mon Sep 17 00:00:00 2001
From: Carola Nitz <nitz.carola@googlemail.com>
Date: Fri, 29 Sep 2017 14:49:02 +0200
Subject: [PATCH 10/26] contrib: use live555 version that is compatible with
......
From c133f69263a08df1fe5294e2aef27fbb8c7bdb6c Mon Sep 17 00:00:00 2001
From 35eacd8c51677d480296572e5bf58f7acaf4a5c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Sun, 17 Dec 2017 18:05:40 +0100
Subject: [PATCH 11/26] libvlc: add a basic API to change freetype's color,
......
From 67417e49bce430acc39293913d3b71d9bc298392 Mon Sep 17 00:00:00 2001
From 1c27a07ca0bce5f92dbf4dbb43a7c23aa19474d6 Mon Sep 17 00:00:00 2001
From: Carola Nitz <nitz.carola@googlemail.com>
Date: Fri, 23 Feb 2018 13:16:41 +0100
Subject: [PATCH 12/26] Work around lack of __thread storage qualifier on old
......@@ -14,7 +14,7 @@ Subject: [PATCH 12/26] Work around lack of __thread storage qualifier on old
rename {compat => src/extras}/tdestroy.c (59%)
diff --git a/configure.ac b/configure.ac
index b29079ac58..32a45bac65 100644
index 49b1166742..9891bed93e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -591,8 +591,8 @@ dnl Check for system libs needed
......
From d8a94452e5eaa9277a5b0164b3863752637630a6 Mon Sep 17 00:00:00 2001
From 62463f4dc3cf5dcccbb406f832dedf518e82399b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Mon, 26 Mar 2018 16:44:44 +0200
Subject: [PATCH 13/26] modules:common: Use the full module name as MODULE_NAME
......
From 810535d5955a255f6a593c38fc83e0dcc525fc0e Mon Sep 17 00:00:00 2001
From 2151e1407c4d28e47b3624ed05940cdb91f7e811 Mon Sep 17 00:00:00 2001
From: Luis Fernandes <zipleen@gmail.com>
Date: Mon, 30 Apr 2018 14:33:08 +0100
Subject: [PATCH 14/26] add auto deinterlacer-mode which is also valid
......
From 5c73dbc36ee0dcd064c63ecb1229d091f61f8401 Mon Sep 17 00:00:00 2001
From f5bebd222fb9817ce9215f334faed48340aba3fe Mon Sep 17 00:00:00 2001
From: Luis Fernandes <zipleen@gmail.com>
Date: Wed, 9 May 2018 10:44:43 +0100
Subject: [PATCH 15/26] Users will be able to change the deinterlace mode
......
From 084ece776ed7b59cc965a7640c67e2572260e0b3 Mon Sep 17 00:00:00 2001
From b333ce257f382fc38e10ef19f09bc290ee259a5c Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 27 Mar 2018 16:49:34 +0200
Subject: [PATCH 16/26] contrib: ffmpeg: enable videotoolbox encoder
......
From 1e835bbeee8972de41af92ee09c245961c2c6b55 Mon Sep 17 00:00:00 2001
From 37825bca4dc6e64e7f919e1cdf8654a352d7a69a Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 27 Mar 2018 16:52:35 +0200
Subject: [PATCH 17/26] chromecast: use vt encoder from avcodec
......
From 17f660095f8d63caffcf91e975f36a2eab1f28df Mon Sep 17 00:00:00 2001
From f61fd05ce713134fa6abfbe89e88be176ef51681 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Mon, 18 Jun 2018 12:31:13 +0200
Subject: [PATCH 18/26] ffmpeg: backport vtenc patches
......
From fea065350574fe5ef6ec8386f9f82341b8043d1f Mon Sep 17 00:00:00 2001
From 46c4a0a08e62fe318520112feeb7c10848c68ea6 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Wed, 17 Jan 2018 10:06:13 +0200
Subject: [PATCH 19/26] core: expose config_AutoSaveConfigFile
......
From 5ac58ad5d126742ad268d9ff8b7a4d19edecf904 Mon Sep 17 00:00:00 2001
From f215007af280e3b85664ea1fafedadb2f9be5c89 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Wed, 17 Jan 2018 10:06:13 +0200
Subject: [PATCH 20/26] lib: save configuration after playback/parse
......
From bb85ff0c4475a0b38b1993761950c1409bf4fce6 Mon Sep 17 00:00:00 2001
From a1a5a96fe411e385473dcbb695c27f0ffcead6fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Mon, 10 Sep 2018 20:55:11 +0200
Subject: [PATCH 21/26] http access: retain auth struct for the runtime of the
......
From ee9623cc93b1e08b8f454808d82a3a3d1d39ea64 Mon Sep 17 00:00:00 2001
From 9ad892cd04503c90a05ffefb0a4e7372e2f5c830 Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Wed, 31 Oct 2018 10:08:55 +0100
Subject: [PATCH 22/26] libvlc: media_player: Add record method
......
From e87086a4b96fbbab7bdd5afe6cc2e694d0c1ecd4 Mon Sep 17 00:00:00 2001
From 5631f226a156cea1838213ebbbf49bcf15f96d50 Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Thu, 27 Sep 2018 18:40:39 +0200
Subject: [PATCH 23/26] libvlc: events: Add callbacks for record
......
From 35c0405eb2d6c39fd1e2c7db4491ad03bdb01357 Mon Sep 17 00:00:00 2001
From e2fc10a5c2f8476737b920670528a10bbc4b85ef Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Mon, 1 Oct 2018 15:37:57 +0200
Subject: [PATCH 24/26] access_output: file: Add error dialog for write/open
......
From 034daa0d65377986472b8d3bc11acf1292ad5b5a Mon Sep 17 00:00:00 2001
From 143033b48bc77061fd9286fb00c82160cd8b8de3 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Wed, 28 Nov 2018 18:27:16 +0100
Subject: [PATCH 25/26] transcode: add support for mutliple venc parameters
......@@ -14,12 +14,12 @@ For example:
will first try avcodec module with h264 video format, then vpx module
with VP8 video format.
---
modules/stream_out/transcode/transcode.c | 257 ++++++++++++++++++-----
modules/stream_out/transcode/transcode.c | 258 ++++++++++++++++++-----
modules/stream_out/transcode/transcode.h | 2 +
2 files changed, 204 insertions(+), 55 deletions(-)
2 files changed, 205 insertions(+), 55 deletions(-)
diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c
index c92dd4a974..9009f312bb 100644
index c92dd4a974..bc9f9e694a 100644
--- a/modules/stream_out/transcode/transcode.c
+++ b/modules/stream_out/transcode/transcode.c
@@ -153,6 +153,9 @@ vlc_module_begin ()
......@@ -152,7 +152,7 @@ index c92dd4a974..9009f312bb 100644
static sout_stream_id_sys_t *Add( sout_stream_t *p_stream,
const es_format_t *p_fmt )
{
@@ -499,49 +522,173 @@ static sout_stream_id_sys_t *Add( sout_stream_t *p_stream,
@@ -499,49 +522,174 @@ static sout_stream_id_sys_t *Add( sout_stream_t *p_stream,
/* Create decoder object */
id->p_decoder = vlc_object_create( p_stream, sizeof( decoder_t ) );
if( !id->p_decoder )
......@@ -176,7 +176,8 @@ index c92dd4a974..9009f312bb 100644
- es_format_Init( &id->p_encoder->fmt_out, p_fmt->i_cat, 0 );
- id->p_encoder->fmt_out.i_id = p_fmt->i_id;
- id->p_encoder->fmt_out.i_group = p_fmt->i_group;
+ if( p_fmt->i_cat == VIDEO_ES ) //&& p_sys->i_vcodec )
+ if( p_fmt->i_cat == VIDEO_ES &&
+ ( p_sys->i_vcodec || p_sys->pp_vencs.i_size > 0 ) )
+ {
+ for( int config_idx=0;
+ config_idx<p_sys->pp_vencs.i_size;
......
From cf17761fdabb21b1dddc318bd5fdfc58fb5ffce2 Mon Sep 17 00:00:00 2001
From 00c4ee62fb59a59c51d4db5efbde0d8b5e1e4a39 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 13 Apr 2018 16:15:16 +0200
Subject: [PATCH 26/26] access: add smb2 module
......@@ -29,7 +29,7 @@ allow to use Builtin NTLMSSP authentication instead of libkrb5.
create mode 100644 modules/access/smb2.c
diff --git a/configure.ac b/configure.ac
index 32a45bac65..4c6305786a 100644
index 9891bed93e..9bbba2b3df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1854,7 +1854,14 @@ AS_IF([test "${SYS}" = "mingw32" -a "${enable_winstore_app}" != "yes"], [ VLC_AD
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment