generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  amr: Cosmetic cleanup
  mov_chan: Fix operator precedence by adding parentheses
  doc: Add missing protocols to list of supported protocols.
  tcp: Check the listen call

Conflicts:
	libavformat/amr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-06-17 22:28:28 +02:00
commit 6ca48ad044
4 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/general.texi
View File

@ -852,19 +852,30 @@ performance on systems without hardware floating point support).
@multitable @columnfractions .4 .1 @multitable @columnfractions .4 .1
@item Name @tab Support @item Name @tab Support
@item Apple HTTP Live Streaming @tab X
@item file @tab X @item file @tab X
@item Gopher @tab X @item Gopher @tab X
@item HLS @tab X
@item HTTP @tab X @item HTTP @tab X
@item MMS @tab X @item HTTPS @tab X
@item MMSH @tab X
@item MMST @tab X
@item pipe @tab X @item pipe @tab X
@item RTMP @tab X
@item RTMPE @tab E
@item RTMPS @tab E
@item RTMPT @tab E
@item RTMPTE @tab E
@item RTP @tab X @item RTP @tab X
@item SCTP @tab X
@item TCP @tab X @item TCP @tab X
@item TLS @tab X
@item UDP @tab X @item UDP @tab X
@end multitable @end multitable
@code{X} means that the protocol is supported. @code{X} means that the protocol is supported.
@code{E} means that support is provided through an external library.
@section Input/Output Devices @section Input/Output Devices

99
libavformat/amr.c
View File

@ -29,27 +29,22 @@ Only mono files are supported.
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
static const char AMR_header [] = "#!AMR\n"; static const char AMR_header[] = "#!AMR\n";
static const char AMRWB_header [] = "#!AMR-WB\n"; static const char AMRWB_header[] = "#!AMR-WB\n";
#if CONFIG_AMR_MUXER #if CONFIG_AMR_MUXER
static int amr_write_header(AVFormatContext *s) static int amr_write_header(AVFormatContext *s)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVCodecContext *enc = s->streams[0]->codec; AVCodecContext *enc = s->streams[0]->codec;
s->priv_data = NULL; s->priv_data = NULL;
if (enc->codec_id == CODEC_ID_AMR_NB) if (enc->codec_id == CODEC_ID_AMR_NB) {
{
avio_write(pb, AMR_header, sizeof(AMR_header) - 1); /* magic number */ avio_write(pb, AMR_header, sizeof(AMR_header) - 1); /* magic number */
} } else if (enc->codec_id == CODEC_ID_AMR_WB) {
else if(enc->codec_id == CODEC_ID_AMR_WB)
{
avio_write(pb, AMRWB_header, sizeof(AMRWB_header) - 1); /* magic number */ avio_write(pb, AMRWB_header, sizeof(AMRWB_header) - 1); /* magic number */
} } else {
else
{
return -1; return -1;
} }
avio_flush(pb); avio_flush(pb);
@ -66,11 +61,11 @@ static int amr_write_packet(AVFormatContext *s, AVPacket *pkt)
static int amr_probe(AVProbeData *p) static int amr_probe(AVProbeData *p)
{ {
//Only check for "#!AMR" which could be amr-wb, amr-nb. // Only check for "#!AMR" which could be amr-wb, amr-nb.
//This will also trigger multichannel files: "#!AMR_MC1.0\n" and // This will also trigger multichannel files: "#!AMR_MC1.0\n" and
//"#!AMR-WB_MC1.0\n" (not supported) // "#!AMR-WB_MC1.0\n" (not supported)
if(memcmp(p->buf,AMR_header,5)==0) if (!memcmp(p->buf, AMR_header, 5))
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
else else
return 0; return 0;
@ -87,81 +82,71 @@ static int amr_read_header(AVFormatContext *s)
st = avformat_new_stream(s, NULL); st = avformat_new_stream(s, NULL);
if (!st) if (!st)
{
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} if (memcmp(header, AMR_header, 6)) {
if(memcmp(header,AMR_header,6)!=0) avio_read(pb, header + 6, 3);
{ if (memcmp(header, AMRWB_header, 9)) {
avio_read(pb, header+6, 3);
if(memcmp(header,AMRWB_header,9)!=0)
{
return -1; return -1;
} }
st->codec->codec_tag = MKTAG('s', 'a', 'w', 'b'); st->codec->codec_tag = MKTAG('s', 'a', 'w', 'b');
st->codec->codec_id = CODEC_ID_AMR_WB; st->codec->codec_id = CODEC_ID_AMR_WB;
st->codec->sample_rate = 16000; st->codec->sample_rate = 16000;
} } else {
else st->codec->codec_tag = MKTAG('s', 'a', 'm', 'r');
{ st->codec->codec_id = CODEC_ID_AMR_NB;
st->codec->codec_tag = MKTAG('s', 'a', 'm', 'r');
st->codec->codec_id = CODEC_ID_AMR_NB;
st->codec->sample_rate = 8000; st->codec->sample_rate = 8000;
} }
st->codec->channels = 1; st->codec->channels = 1;
st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
return 0; return 0;
} }
static int amr_read_packet(AVFormatContext *s, static int amr_read_packet(AVFormatContext *s, AVPacket *pkt)
AVPacket *pkt)
{ {
AVCodecContext *enc = s->streams[0]->codec; AVCodecContext *enc = s->streams[0]->codec;
int read, size = 0, toc, mode; int read, size = 0, toc, mode;
int64_t pos = avio_tell(s->pb); int64_t pos = avio_tell(s->pb);
if (url_feof(s->pb)) if (url_feof(s->pb)) {
{
return AVERROR(EIO); return AVERROR(EIO);
} }
//FIXME this is wrong, this should rather be in a AVParset // FIXME this is wrong, this should rather be in a AVParset
toc=avio_r8(s->pb); toc = avio_r8(s->pb);
mode = (toc >> 3) & 0x0F; mode = (toc >> 3) & 0x0F;
if (enc->codec_id == CODEC_ID_AMR_NB) if (enc->codec_id == CODEC_ID_AMR_NB) {
{ static const uint8_t packed_size[16] = {
static const uint8_t packed_size[16] = {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0}; 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0
};
size=packed_size[mode]+1; size = packed_size[mode] + 1;
} } else if(enc->codec_id == CODEC_ID_AMR_WB) {
else if(enc->codec_id == CODEC_ID_AMR_WB) static uint8_t packed_size[16] = {
{ 18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1
static uint8_t packed_size[16] = {18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1}; };
size=packed_size[mode]; size = packed_size[mode];
} } else {
else
av_assert0(0); av_assert0(0);
if ( (size==0) || av_new_packet(pkt, size))
{
return AVERROR(EIO);
} }
if (!size || av_new_packet(pkt, size))
return AVERROR(EIO);
/* Both AMR formats have 50 frames per second */ /* Both AMR formats have 50 frames per second */
s->streams[0]->codec->bit_rate = size*8*50; s->streams[0]->codec->bit_rate = size*8*50;
pkt->stream_index = 0; pkt->stream_index = 0;
pkt->pos = pos; pkt->pos = pos;
pkt->data[0]=toc; pkt->data[0] = toc;
pkt->duration= enc->codec_id == CODEC_ID_AMR_NB ? 160 : 320; pkt->duration = enc->codec_id == CODEC_ID_AMR_NB ? 160 : 320;
read = avio_read(s->pb, pkt->data+1, size-1); read = avio_read(s->pb, pkt->data + 1, size - 1);
if (read != size-1) if (read != size - 1) {
{
av_free_packet(pkt); av_free_packet(pkt);
return AVERROR(EIO); return AVERROR(EIO);
} }

2
libavformat/mov_chan.c
View File

@ -492,7 +492,7 @@ uint32_t ff_mov_get_channel_layout_tag(enum CodecID codec_id,
/* find the layout tag for the specified channel layout */ /* find the layout tag for the specified channel layout */
for (i = 0; layouts[i] != 0; i++) { for (i = 0; layouts[i] != 0; i++) {
if (layouts[i] & 0xFFFF != channels) if ((layouts[i] & 0xFFFF) != channels)
continue; continue;
for (j = 0; layout_map[j].tag != 0; j++) { for (j = 0; layout_map[j].tag != 0; j++) {
if (layout_map[j].tag == layouts[i] && if (layout_map[j].tag == layouts[i] &&

6
libavformat/tcp.c
View File

@ -90,7 +90,11 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
ret = ff_neterrno(); ret = ff_neterrno();
goto fail1; goto fail1;
} }
listen(fd, 1); ret = listen(fd, 1);
if (ret) {
ret = ff_neterrno();
goto fail1;
}
fd1 = accept(fd, NULL, NULL); fd1 = accept(fd, NULL, NULL);
if (fd1 < 0) { if (fd1 < 0) {
ret = ff_neterrno(); ret = ff_neterrno();