diff options
| author | Max Kellermann <max@duempel.org> | 2013-09-27 12:11:37 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-09-27 12:11:37 +0200 |
| commit | c5d05ac0cf18dbd3d04534de240c437f8b07bd28 (patch) | |
| tree | 5e69c019f69cc6f2f1d99c71448338d855bf4898 /src/decoder/FfmpegDecoderPlugin.cxx | |
| parent | 939003c1f1a8ed9f6e3fe677a63e1686fe35d929 (diff) | |
| download | mpd-c5d05ac0cf18dbd3d04534de240c437f8b07bd28.tar.gz mpd-c5d05ac0cf18dbd3d04534de240c437f8b07bd28.tar.xz mpd-c5d05ac0cf18dbd3d04534de240c437f8b07bd28.zip | |
DecoderCommand: convert to strictly-typed enum
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/FfmpegDecoderPlugin.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx index a0ac5b8fb..a725e1f7d 100644 --- a/src/decoder/FfmpegDecoderPlugin.cxx +++ b/src/decoder/FfmpegDecoderPlugin.cxx @@ -253,7 +253,7 @@ copy_interleave_frame(const AVCodecContext *codec_context, return data_size; } -static enum decoder_command +static DecoderCommand ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is, const AVPacket *packet, AVCodecContext *codec_context, @@ -269,9 +269,8 @@ ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is, uint8_t *output_buffer; - enum decoder_command cmd = DECODE_COMMAND_NONE; - while (packet2.size > 0 && - cmd == DECODE_COMMAND_NONE) { + DecoderCommand cmd = DecoderCommand::NONE; + while (packet2.size > 0 && cmd == DecoderCommand::NONE) { int audio_size = 0; int got_frame = 0; int len = avcodec_decode_audio4(codec_context, @@ -470,7 +469,7 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input) uint8_t *interleaved_buffer = NULL; int interleaved_buffer_size = 0; - enum decoder_command cmd; + DecoderCommand cmd; do { AVPacket packet; if (av_read_frame(format_context, &packet) < 0) @@ -488,7 +487,7 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input) av_free_packet(&packet); - if (cmd == DECODE_COMMAND_SEEK) { + if (cmd == DecoderCommand::SEEK) { int64_t where = time_to_ffmpeg(decoder_seek_where(decoder), av_stream->time_base); @@ -501,7 +500,7 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input) decoder_command_finished(decoder); } } - } while (cmd != DECODE_COMMAND_STOP); + } while (cmd != DecoderCommand::STOP); #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0) avcodec_free_frame(&frame); |