virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Code Issues Releases Activity

Merge commit 'f322b2073581119de5da74f92a03309a36891cfa'

Browse Source 
* commit 'f322b2073581119de5da74f92a03309a36891cfa':
  lavr: only save/restore the mixing matrix if mixing is being done
  rtpdec_vp8: Cosmetics: Fix bad alignment/indentation
  rtpenc: Allow including a SDES/CNAME block in RTCP SR packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-17 14:06:06 +01:00
commit 8d07bbca63
4 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtpdec_vp8.c
View File

@ -33,7 +33,7 @@
struct PayloadContext { struct PayloadContext {
AVIOContext *data; AVIOContext *data;
uint32_t timestamp; uint32_t timestamp;
}; };
static int vp8_handle_packet(AVFormatContext *ctx, static int vp8_handle_packet(AVFormatContext *ctx,
@ -100,7 +100,7 @@ static int vp8_handle_packet(AVFormatContext *ctx,
if ((res = avio_open_dyn_buf(&vp8->data)) < 0) if ((res = avio_open_dyn_buf(&vp8->data)) < 0)
return res; return res;
vp8->timestamp = *timestamp; vp8->timestamp = *timestamp;
} }
if (!vp8->data || vp8->timestamp != *timestamp) { if (!vp8->data || vp8->timestamp != *timestamp) {
av_log(ctx, AV_LOG_WARNING, av_log(ctx, AV_LOG_WARNING,

17
libavformat/rtpenc.c
View File

@ -34,6 +34,7 @@ static const AVOption options[] = {
FF_RTP_FLAG_OPTS(RTPMuxContext, flags), FF_RTP_FLAG_OPTS(RTPMuxContext, flags),
{ "payload_type", "Specify RTP payload type", offsetof(RTPMuxContext, payload_type), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 127, AV_OPT_FLAG_ENCODING_PARAM }, { "payload_type", "Specify RTP payload type", offsetof(RTPMuxContext, payload_type), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 127, AV_OPT_FLAG_ENCODING_PARAM },
{ "ssrc", "Stream identifier", offsetof(RTPMuxContext, ssrc), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, { "ssrc", "Stream identifier", offsetof(RTPMuxContext, ssrc), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
{ "cname", "CNAME to include in RTCP SR packets", offsetof(RTPMuxContext, cname), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
{ NULL }, { NULL },
}; };
@ -271,6 +272,22 @@ static void rtcp_send_sr(AVFormatContext *s1, int64_t ntp_time)
avio_wb32(s1->pb, rtp_ts); avio_wb32(s1->pb, rtp_ts);
avio_wb32(s1->pb, s->packet_count); avio_wb32(s1->pb, s->packet_count);
avio_wb32(s1->pb, s->octet_count); avio_wb32(s1->pb, s->octet_count);
if (s->cname) {
int len = FFMIN(strlen(s->cname), 255);
avio_w8(s1->pb, (RTP_VERSION << 6) + 1);
avio_w8(s1->pb, RTCP_SDES);
avio_wb16(s1->pb, (7 + len + 3) / 4); /* length in words - 1 */
avio_wb32(s1->pb, s->ssrc);
avio_w8(s1->pb, 0x01); /* CNAME */
avio_w8(s1->pb, len);
avio_write(s1->pb, s->cname, len);
avio_w8(s1->pb, 0); /* END */
for (len = (7 + len) % 4; len % 4; len++)
avio_w8(s1->pb, 0);
}
avio_flush(s1->pb); avio_flush(s1->pb);
} }

1
libavformat/rtpenc.h
View File

@ -30,6 +30,7 @@ struct RTPMuxContext {
AVStream *st; AVStream *st;
int payload_type; int payload_type;
uint32_t ssrc; uint32_t ssrc;
const char *cname;
uint16_t seq; uint16_t seq;
uint32_t timestamp; uint32_t timestamp;
uint32_t base_timestamp; uint32_t base_timestamp;

18
libavresample/resample.c
View File

@ -259,6 +259,7 @@ int avresample_set_compensation(AVAudioResampleContext *avr, int sample_delta,
AVAudioResampleContext and force resampling */ AVAudioResampleContext and force resampling */
if (!avr->resample_needed) { if (!avr->resample_needed) {
int fifo_samples; int fifo_samples;
int restore_matrix = 0;
double matrix[AVRESAMPLE_MAX_CHANNELS * AVRESAMPLE_MAX_CHANNELS] = { 0 }; double matrix[AVRESAMPLE_MAX_CHANNELS * AVRESAMPLE_MAX_CHANNELS] = { 0 };
/* buffer any remaining samples in the output FIFO before closing */ /* buffer any remaining samples in the output FIFO before closing */
@ -274,9 +275,12 @@ int avresample_set_compensation(AVAudioResampleContext *avr, int sample_delta,
goto reinit_fail; goto reinit_fail;
} }
/* save the channel mixing matrix */ /* save the channel mixing matrix */
ret = avresample_get_matrix(avr, matrix, AVRESAMPLE_MAX_CHANNELS); if (avr->am) {
if (ret < 0) ret = avresample_get_matrix(avr, matrix, AVRESAMPLE_MAX_CHANNELS);
goto reinit_fail; if (ret < 0)
goto reinit_fail;
restore_matrix = 1;
}
/* close the AVAudioResampleContext */ /* close the AVAudioResampleContext */
avresample_close(avr); avresample_close(avr);
@ -284,9 +288,11 @@ int avresample_set_compensation(AVAudioResampleContext *avr, int sample_delta,
avr->force_resampling = 1; avr->force_resampling = 1;
/* restore the channel mixing matrix */ /* restore the channel mixing matrix */
ret = avresample_set_matrix(avr, matrix, AVRESAMPLE_MAX_CHANNELS); if (restore_matrix) {
if (ret < 0) ret = avresample_set_matrix(avr, matrix, AVRESAMPLE_MAX_CHANNELS);
goto reinit_fail; if (ret < 0)
goto reinit_fail;
}
/* re-open the AVAudioResampleContext */ /* re-open the AVAudioResampleContext */
ret = avresample_open(avr); ret = avresample_open(avr);