maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-495: Add whitespace and reflow as necessary to improve readability.

Browse Source
This commit is contained in:
Michael Jumper 2020-06-24 02:25:02 -07:00
parent 9b891e2360
commit fb94ef9e9a
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/guacenc/ffmpeg-compat.c
View File

@ -54,7 +54,9 @@ static int guacenc_write_packet(guacenc_video* video, void* data, int size) {
int ret; int ret;
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,1,0) #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,1,0)
AVPacket pkt; AVPacket pkt;
/* Have to create a packet around the encoded data we have */ /* Have to create a packet around the encoded data we have */
av_init_packet(&pkt); av_init_packet(&pkt);
@ -73,12 +75,13 @@ static int guacenc_write_packet(guacenc_video* video, void* data, int size) {
ret = av_interleaved_write_frame(video->container_format_context, &pkt); ret = av_interleaved_write_frame(video->container_format_context, &pkt);
#else #else
AVPacket *pkt;
/* we know data is already a packet if we're using a newer libavcodec */ /* We know data is already a packet if we're using a newer libavcodec */
pkt = (AVPacket*) data; AVPacket* pkt = (AVPacket*) data;
av_packet_rescale_ts(pkt, video->context->time_base, video->output_stream->time_base); av_packet_rescale_ts(pkt, video->context->time_base, video->output_stream->time_base);
pkt->stream_index = video->output_stream->index; pkt->stream_index = video->output_stream->index;
ret = av_interleaved_write_frame(video->container_format_context, pkt); ret = av_interleaved_write_frame(video->container_format_context, pkt);
#endif #endif
@ -142,6 +145,7 @@ int guacenc_avcodec_encode_video(guacenc_video* video, AVFrame* frame) {
/* For libavcodec < 57.37.100: input/output was not decoupled */ /* For libavcodec < 57.37.100: input/output was not decoupled */
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,37,100) #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,37,100)
/* Write frame to video */ /* Write frame to video */
int got_data; int got_data;
if (avcodec_encode_video2(video->context, &packet, frame, &got_data) < 0) { if (avcodec_encode_video2(video->context, &packet, frame, &got_data) < 0) {
@ -155,7 +159,9 @@ int guacenc_avcodec_encode_video(guacenc_video* video, AVFrame* frame) {
guacenc_write_packet(video, (void*) &packet, packet.size); guacenc_write_packet(video, (void*) &packet, packet.size);
av_packet_unref(&packet); av_packet_unref(&packet);
} }
#else #else
/* Write frame to video */ /* Write frame to video */
int result = avcodec_send_frame(video->context, frame); int result = avcodec_send_frame(video->context, frame);
@ -182,6 +188,7 @@ int guacenc_avcodec_encode_video(guacenc_video* video, AVFrame* frame) {
av_packet_unref(&packet); av_packet_unref(&packet);
} }
#endif #endif
/* Frame may have been queued for later writing / reordering */ /* Frame may have been queued for later writing / reordering */
@ -232,14 +239,16 @@ AVCodecContext* guacenc_build_avcodeccontext(AVStream* stream, AVCodec* codec,
int guacenc_open_avcodec(AVCodecContext *avcodec_context, int guacenc_open_avcodec(AVCodecContext *avcodec_context,
AVCodec *codec, AVDictionary **options, AVCodec *codec, AVDictionary **options,
AVStream* stream) { AVStream* stream) {
int ret = avcodec_open2(avcodec_context, codec, options); int ret = avcodec_open2(avcodec_context, codec, options);
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100) #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100)
/* copy stream parameters to the muxer */ /* Copy stream parameters to the muxer */
int codecpar_ret = avcodec_parameters_from_context(stream->codecpar, int codecpar_ret = avcodec_parameters_from_context(stream->codecpar, avcodec_context);
avcodec_context); if (codecpar_ret < 0)
if (codecpar_ret < 0) {
return codecpar_ret; return codecpar_ret;
}
#endif #endif
return ret; return ret;
} }