* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavutil/attributes.h"
-#include "libavutil/bswap.h"
#include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h"
int counter;
int swap;
int dss_sp_swap_byte;
- int8_t *dss_sp_buf;
int packet_size;
int dss_header_size;
ret = avio_read(s->pb, value, size);
if (ret < size) {
- ret = ret < 0 ? ret : AVERROR_EOF;
- goto exit;
+ av_free(value);
+ return ret < 0 ? ret : AVERROR_EOF;
}
- ret = av_dict_set(&s->metadata, key, value, 0);
-
-exit:
- av_free(value);
- return ret;
+ return av_dict_set(&s->metadata, key, value, AV_DICT_DONT_STRDUP_VAL);
}
static int dss_read_header(AVFormatContext *s)
if (ctx->audio_codec == DSS_ACODEC_DSS_SP) {
st->codecpar->codec_id = AV_CODEC_ID_DSS_SP;
st->codecpar->sample_rate = 11025;
+ s->bit_rate = 8 * (DSS_FRAME_SIZE - 1) * st->codecpar->sample_rate
+ * 512 / (506 * 264);
} else if (ctx->audio_codec == DSS_ACODEC_G723_1) {
st->codecpar->codec_id = AV_CODEC_ID_G723_1;
st->codecpar->sample_rate = 8000;
ctx->counter = 0;
ctx->swap = 0;
- ctx->dss_sp_buf = av_malloc(DSS_FRAME_SIZE + 1);
- if (!ctx->dss_sp_buf)
- return AVERROR(ENOMEM);
-
return 0;
}
ctx->counter += DSS_BLOCK_SIZE - DSS_AUDIO_BLOCK_HEADER_SIZE;
}
-static void dss_sp_byte_swap(DSSDemuxContext *ctx,
- uint8_t *dst, const uint8_t *src)
+static void dss_sp_byte_swap(DSSDemuxContext *ctx, uint8_t *data)
{
int i;
if (ctx->swap) {
- for (i = 3; i < DSS_FRAME_SIZE; i += 2)
- dst[i] = src[i];
-
for (i = 0; i < DSS_FRAME_SIZE - 2; i += 2)
- dst[i] = src[i + 4];
+ data[i] = data[i + 4];
- dst[1] = ctx->dss_sp_swap_byte;
+ /* Zero the padding. */
+ data[DSS_FRAME_SIZE] = 0;
+ data[1] = ctx->dss_sp_swap_byte;
} else {
- memcpy(dst, src, DSS_FRAME_SIZE);
- ctx->dss_sp_swap_byte = src[DSS_FRAME_SIZE - 2];
+ ctx->dss_sp_swap_byte = data[DSS_FRAME_SIZE - 2];
}
/* make sure byte 40 is always 0 */
- dst[DSS_FRAME_SIZE - 2] = 0;
+ data[DSS_FRAME_SIZE - 2] = 0;
ctx->swap ^= 1;
}
static int dss_sp_read_packet(AVFormatContext *s, AVPacket *pkt)
{
DSSDemuxContext *ctx = s->priv_data;
- AVStream *st = s->streams[0];
int read_size, ret, offset = 0, buff_offset = 0;
int64_t pos = avio_tell(s->pb);
} else
read_size = DSS_FRAME_SIZE;
- ctx->counter -= read_size;
- ctx->packet_size = DSS_FRAME_SIZE - 1;
-
ret = av_new_packet(pkt, DSS_FRAME_SIZE);
if (ret < 0)
return ret;
pkt->duration = 264;
pkt->pos = pos;
pkt->stream_index = 0;
- s->bit_rate = 8LL * ctx->packet_size * st->codecpar->sample_rate * 512 / (506 * pkt->duration);
-
- if (ctx->counter < 0) {
- int size2 = ctx->counter + read_size;
- ret = avio_read(s->pb, ctx->dss_sp_buf + offset + buff_offset,
- size2 - offset);
- if (ret < size2 - offset)
+ if (ctx->counter < read_size) {
+ ret = avio_read(s->pb, pkt->data + buff_offset,
+ ctx->counter);
+ if (ret < ctx->counter)
goto error_eof;
+ offset = ctx->counter;
dss_skip_audio_header(s, pkt);
- offset = size2;
}
+ ctx->counter -= read_size;
- ret = avio_read(s->pb, ctx->dss_sp_buf + offset + buff_offset,
+ /* This will write one byte into pkt's padding if buff_offset == 3 */
+ ret = avio_read(s->pb, pkt->data + offset + buff_offset,
read_size - offset);
if (ret < read_size - offset)
goto error_eof;
- dss_sp_byte_swap(ctx, pkt->data, ctx->dss_sp_buf);
+ dss_sp_byte_swap(ctx, pkt->data);
if (ctx->dss_sp_swap_byte < 0) {
- ret = AVERROR(EAGAIN);
- goto error_eof;
+ return AVERROR(EAGAIN);
}
- return pkt->size;
+ return 0;
error_eof:
- av_packet_unref(pkt);
return ret < 0 ? ret : AVERROR_EOF;
}
size = frame_size[byte & 3];
ctx->packet_size = size;
- ctx->counter -= size;
+ ctx->counter--;
ret = av_new_packet(pkt, size);
if (ret < 0)
pkt->data[0] = byte;
offset = 1;
pkt->duration = 240;
- s->bit_rate = 8LL * size * st->codecpar->sample_rate * 512 / (506 * pkt->duration);
+ s->bit_rate = 8LL * size-- * st->codecpar->sample_rate * 512 / (506 * pkt->duration);
pkt->stream_index = 0;
- if (ctx->counter < 0) {
- int size2 = ctx->counter + size;
-
+ if (ctx->counter < size) {
ret = avio_read(s->pb, pkt->data + offset,
- size2 - offset);
- if (ret < size2 - offset) {
- av_packet_unref(pkt);
+ ctx->counter);
+ if (ret < ctx->counter)
return ret < 0 ? ret : AVERROR_EOF;
- }
+ offset += ctx->counter;
+ size -= ctx->counter;
+ ctx->counter = 0;
dss_skip_audio_header(s, pkt);
- offset = size2;
}
+ ctx->counter -= size;
- ret = avio_read(s->pb, pkt->data + offset, size - offset);
- if (ret < size - offset) {
- av_packet_unref(pkt);
+ ret = avio_read(s->pb, pkt->data + offset, size);
+ if (ret < size)
return ret < 0 ? ret : AVERROR_EOF;
- }
- return pkt->size;
+ return 0;
}
static int dss_read_packet(AVFormatContext *s, AVPacket *pkt)
return dss_723_1_read_packet(s, pkt);
}
-static int dss_read_close(AVFormatContext *s)
-{
- DSSDemuxContext *ctx = s->priv_data;
-
- av_freep(&ctx->dss_sp_buf);
-
- return 0;
-}
-
static int dss_read_seek(AVFormatContext *s, int stream_index,
int64_t timestamp, int flags)
{
}
-AVInputFormat ff_dss_demuxer = {
+const AVInputFormat ff_dss_demuxer = {
.name = "dss",
.long_name = NULL_IF_CONFIG_SMALL("Digital Speech Standard (DSS)"),
.priv_data_size = sizeof(DSSDemuxContext),
.read_probe = dss_probe,
.read_header = dss_read_header,
.read_packet = dss_read_packet,
- .read_close = dss_read_close,
.read_seek = dss_read_seek,
.extensions = "dss"
};
projects / ffmpeg / blobdiff