From 3dae882c2482497ddda03248eb03993924dd2bb5 Mon Sep 17 00:00:00 2001 From: max_10 Date: Fri, 15 Dec 2017 12:33:01 +0100 Subject: [PATCH] libeplayer3: code format Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/61903c41fde19487d7294d2c8662f754c89545e1 Author: max_10 Date: 2017-12-15 (Fri, 15 Dec 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/input.cpp | 74 +++++++++++++++++------------------ libeplayer3/output.cpp | 2 +- libeplayer3/writer/pcm.cpp | 38 +++++++++--------- libeplayer3/writer/writer.cpp | 10 ++--- 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/libeplayer3/input.cpp b/libeplayer3/input.cpp index 8214070..9af9aae 100644 --- a/libeplayer3/input.cpp +++ b/libeplayer3/input.cpp @@ -545,7 +545,7 @@ bool Input::UpdateTracks() } track.pid = use_index_as_pid ? n + 1: stream->id; - track.ac3flags = 0; + track.ac3flags = 0; switch (stream->codec->codec_type) { case AVMEDIA_TYPE_VIDEO: @@ -555,43 +555,43 @@ bool Input::UpdateTracks() break; case AVMEDIA_TYPE_AUDIO: switch(stream->codec->codec_id) { - case AV_CODEC_ID_MP2: - track.ac3flags = 1; - break; - case AV_CODEC_ID_MP3: - track.ac3flags = 2; - break; - case AV_CODEC_ID_AC3: - track.ac3flags = 3; - break; - case AV_CODEC_ID_DTS: - track.ac3flags = 4; - break; - case AV_CODEC_ID_AAC: { - unsigned int extradata_size = stream->codec->extradata_size; - unsigned int object_type = 2; - if(extradata_size >= 2) - object_type = stream->codec->extradata[0] >> 3; - if (extradata_size <= 1 || object_type == 1 || object_type == 5) { - fprintf(stderr, "use resampling for AAC\n"); - track.ac3flags = 6; - } - else - track.ac3flags = 5; - break; - } - case AV_CODEC_ID_FLAC: - track.ac3flags = 8; - break; - case AV_CODEC_ID_WMAV1: - case AV_CODEC_ID_WMAV2: - case AV_CODEC_ID_WMAVOICE: - case AV_CODEC_ID_WMAPRO: - case AV_CODEC_ID_WMALOSSLESS: - track.ac3flags = 9; - break; + case AV_CODEC_ID_MP2: + track.ac3flags = 1; + break; + case AV_CODEC_ID_MP3: + track.ac3flags = 2; + break; + case AV_CODEC_ID_AC3: + track.ac3flags = 3; + break; + case AV_CODEC_ID_DTS: + track.ac3flags = 4; + break; + case AV_CODEC_ID_AAC: { + unsigned int extradata_size = stream->codec->extradata_size; + unsigned int object_type = 2; + if(extradata_size >= 2) + object_type = stream->codec->extradata[0] >> 3; + if (extradata_size <= 1 || object_type == 1 || object_type == 5) { + fprintf(stderr, "use resampling for AAC\n"); + track.ac3flags = 6; + } + else + track.ac3flags = 5; + break; + } + case AV_CODEC_ID_FLAC: + track.ac3flags = 8; + break; + case AV_CODEC_ID_WMAV1: + case AV_CODEC_ID_WMAV2: + case AV_CODEC_ID_WMAVOICE: + case AV_CODEC_ID_WMAPRO: + case AV_CODEC_ID_WMALOSSLESS: + track.ac3flags = 9; + break; default: - track.ac3flags = 0; + track.ac3flags = 0; } player->manager.addAudioTrack(track); if (!audioTrack) diff --git a/libeplayer3/output.cpp b/libeplayer3/output.cpp index 5b8cb65..431dcb5 100644 --- a/libeplayer3/output.cpp +++ b/libeplayer3/output.cpp @@ -311,7 +311,7 @@ bool Output::SwitchAudio(Track *track) } audioTrack = track; if (track->stream) { - AVCodecContext *avcc = track->stream->codec; + AVCodecContext *avcc = track->stream->codec; if (!avcc) return false; audioWriter = Writer::GetWriter(avcc->codec_id, avcc->codec_type, audioTrack->ac3flags); diff --git a/libeplayer3/writer/pcm.cpp b/libeplayer3/writer/pcm.cpp index 7fe2579..372a215 100644 --- a/libeplayer3/writer/pcm.cpp +++ b/libeplayer3/writer/pcm.cpp @@ -242,24 +242,24 @@ bool WriterPCM::Write(AVPacket *packet, int64_t pts) restart_audio_resampling = false; initialHeader = true; - if (swr) { - swr_free(&swr); - swr = NULL; + if (swr) { + swr_free(&swr); + swr = NULL; } - if (decoded_frame) { - av_frame_free(&decoded_frame); - decoded_frame = NULL; + if (decoded_frame) { + av_frame_free(&decoded_frame); + decoded_frame = NULL; } AVCodec *codec = avcodec_find_decoder(c->codec_id); - if (!codec) { - fprintf(stderr, "%s %d: avcodec_find_decoder(%llx)\n", __func__, __LINE__, (unsigned long long) c->codec_id); - return false; + if (!codec) { + fprintf(stderr, "%s %d: avcodec_find_decoder(%llx)\n", __func__, __LINE__, (unsigned long long) c->codec_id); + return false; } avcodec_close(c); - if (avcodec_open2(c, codec, NULL)) { - fprintf(stderr, "%s %d: avcodec_open2 failed\n", __func__, __LINE__); - return false; + if (avcodec_open2(c, codec, NULL)) { + fprintf(stderr, "%s %d: avcodec_open2 failed\n", __func__, __LINE__); + return false; } } @@ -315,13 +315,13 @@ bool WriterPCM::Write(AVPacket *packet, int64_t pts) while (packet_size > 0 || (!packet_size && !packet->data)) { int got_frame = 0; - if (!decoded_frame) { - if (!(decoded_frame = av_frame_alloc())) { - fprintf(stderr, "out of memory\n"); - exit(1); - } - } else - av_frame_unref(decoded_frame); + if (!decoded_frame) { + if (!(decoded_frame = av_frame_alloc())) { + fprintf(stderr, "out of memory\n"); + exit(1); + } + } else + av_frame_unref(decoded_frame); int len = avcodec_decode_audio4(c, decoded_frame, &got_frame, packet); if (len < 0) { diff --git a/libeplayer3/writer/writer.cpp b/libeplayer3/writer/writer.cpp index 3a0b9f0..daadecd 100644 --- a/libeplayer3/writer/writer.cpp +++ b/libeplayer3/writer/writer.cpp @@ -68,21 +68,21 @@ static Writer writer __attribute__ ((init_priority (300))); Writer *Writer::GetWriter(enum AVCodecID id, enum AVMediaType codec_type, int track_type) { - fprintf(stderr, "GETWRITER %d %d %d", id, codec_type, track_type); + fprintf(stderr, "GETWRITER %d %d %d", id, codec_type, track_type); if (track_type != 6) { // hack for ACC resampling std::map::iterator it = writers.find(id); - if (it != writers.end()) - return it->second; + if (it != writers.end()) + return it->second; } switch (codec_type) { case AVMEDIA_TYPE_AUDIO: if (id == AV_CODEC_ID_INJECTPCM) // should not happen break; - return GetWriter(AV_CODEC_ID_INJECTPCM, codec_type, 100); + return GetWriter(AV_CODEC_ID_INJECTPCM, codec_type, 100); case AVMEDIA_TYPE_VIDEO: if (id == AV_CODEC_ID_MPEG2TS) // should not happen break; - return GetWriter(AV_CODEC_ID_MPEG2TS, codec_type, 100); + return GetWriter(AV_CODEC_ID_MPEG2TS, codec_type, 100); default: break; }