Skip to content

V
vlc-gpu
Commit 6c46174d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

CrystalHD: comments

parent 15e31aa8
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
modules/codec/crystalhd.c
View file @ 6c46174d
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <vlc_codec.h> #include <vlc_codec.h>
/* Workaround for some versions of libcrystalHD */
#if !defined(_WIN32) && !defined(__APPLE__) #if !defined(_WIN32) && !defined(__APPLE__)
# define __LINUX_USER__ # define __LINUX_USER__
#endif #endif
...@@ -168,6 +169,10 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -168,6 +169,10 @@ static int OpenDecoder( vlc_object_t *p_this )
p_sys->i_sps_pps_size = 0; p_sys->i_sps_pps_size = 0;
p_sys->p_sps_pps_buf = NULL; p_sys->p_sps_pps_buf = NULL;
/* Win32 code *
* We cannot link and ship BCM dll, even with LGPL license (too big)
* and if we don't ship it, the plugin would not work depending on the
* installation order => DLopen */
#ifdef USE_DL_OPENING #ifdef USE_DL_OPENING
# define DLL_NAME "bcmDIL.dll" # define DLL_NAME "bcmDIL.dll"
# define PATHS_NB 3 # define PATHS_NB 3
...@@ -270,7 +275,7 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -270,7 +275,7 @@ static int OpenDecoder( vlc_object_t *p_this )
} }
} }
/* Always YUY2 color */ /* Always use YUY2 color */
if( BC_FUNC(DtsSetColorSpace)( p_sys->bcm_handle, OUTPUT_MODE422_YUY2 ) != BC_STS_SUCCESS ) if( BC_FUNC(DtsSetColorSpace)( p_sys->bcm_handle, OUTPUT_MODE422_YUY2 ) != BC_STS_SUCCESS )
{ {
msg_Err( p_dec, "Couldn't set the color space. Please report this!" ); msg_Err( p_dec, "Couldn't set the color space. Please report this!" );
...@@ -557,8 +562,8 @@ static int crystal_insert_sps_pps(decoder_t *p_dec, uint8_t *p_buf, uint32_t i_b ...@@ -557,8 +562,8 @@ static int crystal_insert_sps_pps(decoder_t *p_dec, uint8_t *p_buf, uint32_t i_b
/* Read infos in first 6 bytes */ /* Read infos in first 6 bytes */
i_profile = (p_buf[1] << 16) | (p_buf[2] << 8) | p_buf[3]; i_profile = (p_buf[1] << 16) | (p_buf[2] << 8) | p_buf[3];
p_sys->i_nal_size = (p_buf[4] & 0x03) + 1; p_sys->i_nal_size = (p_buf[4] & 0x03) + 1;
p_buf += 5; p_buf += 5;
i_data_size -= 5; i_data_size -= 5;
for ( unsigned int j = 0; j < 2; j++ ) for ( unsigned int j = 0; j < 2; j++ )
{ {
......
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