* 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.
- *
+ *
* This library 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 this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
for( int y = 0; y < i_height; ++y )
{
const uint8_t *src = (const uint8_t *)frame_bytes + i_stride * y;
- uint8_t *dst = (uint8_t *)p_video_frame->p_buffer + i_width * i_bpp * y;
+ uint8_t *dst = p_video_frame->p_buffer + i_width * i_bpp * y;
memcpy( dst, src, i_width * i_bpp );
}
BMDTimeValue stream_time, frame_duration;
videoFrame->GetStreamTime( &stream_time, &frame_duration, CLOCK_FREQ );
p_video_frame->i_flags = BLOCK_FLAG_TYPE_I | p_sys->i_dominance_flags;
- if( p_sys->b_first_frame )
- {
- p_video_frame->i_flags |= BLOCK_FLAG_DISCONTINUITY;
- p_sys->b_first_frame = false;
- }
p_video_frame->i_pts = p_video_frame->i_dts = VLC_TS_0 + stream_time;
}
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- int ret = VLC_SUCCESS;
+ int ret = VLC_EGENERIC;
char *psz_aspect;
char *psz_display_mode = NULL;
char *psz_video_connection = NULL;
int i_card_index;
int i_width, i_height, i_fps_num, i_fps_den;
int i_rate;
+ unsigned u_aspect_num, u_aspect_den;
/* Only when selected */
if( *p_demux->psz_access == '\0' )
if( !decklink_iterator )
{
msg_Err( p_demux, "DeckLink drivers not found." );
- ret = VLC_EGENERIC;
goto finish;
}
HRESULT result;
i_card_index = var_InheritInteger( p_demux, "decklink-card-index" );
+ if( i_card_index < 0 )
+ {
+ msg_Err( p_demux, "Invalid card index %d", i_card_index );
+ goto finish;
+ }
+
for( int i = 0; i <= i_card_index; ++i )
{
if( p_sys->p_card )
if( result != S_OK )
{
msg_Err( p_demux, "DeckLink PCI card %d not found", i_card_index );
- ret = VLC_EGENERIC;
goto finish;
}
if( result != S_OK )
{
msg_Err( p_demux, "Could not get model name" );
- ret = VLC_EGENERIC;
goto finish;
}
if( p_sys->p_card->QueryInterface( IID_IDeckLinkInput, (void**)&p_sys->p_input) != S_OK )
{
msg_Err( p_demux, "Card has no inputs" );
- ret = VLC_EGENERIC;
goto finish;
}
if( p_sys->p_card->QueryInterface( IID_IDeckLinkConfiguration, (void**)&p_config) != S_OK )
{
msg_Err( p_demux, "Failed to get configuration interface" );
- ret = VLC_EGENERIC;
goto finish;
}
{
msg_Err( p_demux, "Invalid --decklink-video-connection specified; choose one of " \
"sdi, hdmi, opticalsdi, component, composite, or svideo." );
- ret = VLC_EGENERIC;
goto finish;
}
if( result != S_OK )
{
msg_Err( p_demux, "Failed to set video input connection" );
- ret = VLC_EGENERIC;
goto finish;
}
}
{
msg_Err( p_demux, "Invalid --decklink-audio-connection specified; choose one of " \
"embedded, aesebu, or analog." );
- ret = VLC_EGENERIC;
goto finish;
}
if( result != S_OK )
{
msg_Err( p_demux, "Failed to set audio input connection" );
- ret = VLC_EGENERIC;
goto finish;
}
}
if( result != S_OK )
{
msg_Err( p_demux, "Failed to enumerate display modes" );
- ret = VLC_EGENERIC;
goto finish;
}
- psz_display_mode = var_InheritString( p_demux, "decklink-mode" );
- if( !psz_display_mode || strlen( psz_display_mode ) == 0 || strlen( psz_display_mode ) > 4 ) {
+ psz_display_mode = var_CreateGetNonEmptyString( p_demux, "decklink-mode" );
+ if( !psz_display_mode || strlen( psz_display_mode ) > 4 ) {
msg_Err( p_demux, "Missing or invalid --decklink-mode string" );
- ret = VLC_EGENERIC;
goto finish;
}
{
msg_Err( p_demux, "Failed to get display mode name" );
p_display_mode->Release();
- ret = VLC_EGENERIC;
goto finish;
}
{
msg_Err( p_demux, "Failed to get frame rate" );
p_display_mode->Release();
- ret = VLC_EGENERIC;
goto finish;
}
msg_Err( p_demux, "Unknown video mode specified. " \
"Run VLC with -v --verbose-objects=-all,+decklink " \
"to get a list of supported modes." );
- ret = VLC_EGENERIC;
goto finish;
}
if( result != S_OK )
{
msg_Err( p_demux, "Failed to enable video input" );
- ret = VLC_EGENERIC;
goto finish;
}
if( result != S_OK )
{
msg_Err( p_demux, "Failed to enable audio input" );
- ret = VLC_EGENERIC;
goto finish;
}
}
{
msg_Err( p_demux, "Could not start streaming from SDI card. This could be caused "
"by invalid video mode or flags, access denied, or card already in use." );
- ret = VLC_EGENERIC;
goto finish;
}
video_fmt.video.i_frame_rate_base = i_fps_den;
video_fmt.i_bitrate = video_fmt.video.i_width * video_fmt.video.i_height * video_fmt.video.i_frame_rate * 2 * 8;
- psz_aspect = var_CreateGetNonEmptyString( p_demux, "decklink-aspect-ratio" );
- if( psz_aspect )
- {
- char *psz_denominator = strchr( psz_aspect, ':' );
- if( psz_denominator )
- {
- *psz_denominator++ = '\0';
- video_fmt.video.i_sar_num = atoi( psz_aspect ) * video_fmt.video.i_height;
- video_fmt.video.i_sar_den = atoi( psz_denominator ) * video_fmt.video.i_width;
- }
- free( psz_aspect );
+ if ( !var_InheritURational( p_demux, &u_aspect_num, &u_aspect_den, "decklink-aspect-ratio" ) &&
+ u_aspect_num > 0 && u_aspect_den > 0 ) {
+ video_fmt.video.i_sar_num = u_aspect_num * video_fmt.video.i_height;
+ video_fmt.video.i_sar_den = u_aspect_den * video_fmt.video.i_width;
}
msg_Dbg( p_demux, "added new video es %4.4s %dx%d",
(char*)&audio_fmt.i_codec, audio_fmt.audio.i_rate, audio_fmt.audio.i_bitspersample, audio_fmt.audio.i_channels);
p_sys->p_audio_es = es_out_Add( p_demux->out, &audio_fmt );
- /* Update default_pts to a suitable value for access */
- var_Create( p_demux, "decklink-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ ret = VLC_SUCCESS;
finish:
if( decklink_iterator )
case DEMUX_GET_PTS_DELAY:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = var_GetInteger( p_demux, "decklink-caching" ) * 1000;
+ *pi64 = var_InheritInteger( p_demux, "decklink-caching" ) * 1000;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
projects / vlc / blobdiff