Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

vertical align

Browse Source 
Originally committed as revision 13996 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 17 years ago
parent c1f6eca124
commit e100245441
1 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      libavformat/psxstr.c

20
libavformat/psxstr.c
Unescape View File

@ -36,11 +36,11 @@
#define RIFF_TAG MKTAG('R', 'I', 'F', 'F') #define RIFF_TAG MKTAG('R', 'I', 'F', 'F')
#define CDXA_TAG MKTAG('C', 'D', 'X', 'A') #define CDXA_TAG MKTAG('C', 'D', 'X', 'A')
#define RAW_CD_SECTOR_SIZE 2352 #define RAW_CD_SECTOR_SIZE 2352
#define RAW_CD_SECTOR_DATA_SIZE 2304 #define RAW_CD_SECTOR_DATA_SIZE 2304
#define VIDEO_DATA_CHUNK_SIZE 0x7E0 #define VIDEO_DATA_CHUNK_SIZE 0x7E0
#define VIDEO_DATA_HEADER_SIZE 0x38 #define VIDEO_DATA_HEADER_SIZE 0x38
#define RIFF_HEADER_SIZE 0x2C #define RIFF_HEADER_SIZE 0x2C
#define CDXA_TYPE_MASK 0x0E #define CDXA_TYPE_MASK 0x0E
#define CDXA_TYPE_DATA 0x08 #define CDXA_TYPE_DATA 0x08
@ -169,8 +169,8 @@ static int str_read_header(AVFormatContext *s,
str->channels[channel].video_stream_index = st->index; str->channels[channel].video_stream_index = st->index;
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_MDEC; st->codec->codec_id = CODEC_ID_MDEC;
st->codec->codec_tag = 0; /* no fourcc */ st->codec->codec_tag = 0; /* no fourcc */
st->codec->width = AV_RL16(&sector[0x28]); st->codec->width = AV_RL16(&sector[0x28]);
st->codec->height = AV_RL16(&sector[0x2A]); st->codec->height = AV_RL16(&sector[0x2A]);
} }
@ -190,10 +190,10 @@ static int str_read_header(AVFormatContext *s,
str->channels[channel].audio_stream_index = st->index; str->channels[channel].audio_stream_index = st->index;
fmt = sector[0x13]; fmt = sector[0x13];
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_ADPCM_XA; st->codec->codec_id = CODEC_ID_ADPCM_XA;
st->codec->codec_tag = 0; /* no fourcc */ st->codec->codec_tag = 0; /* no fourcc */
st->codec->channels = (fmt&1)?2:1; st->codec->channels = (fmt&1)?2:1;
st->codec->sample_rate = (fmt&4)?18900:37800; st->codec->sample_rate = (fmt&4)?18900:37800;
// st->codec->bit_rate = 0; //FIXME; // st->codec->bit_rate = 0; //FIXME;
st->codec->block_align = 128; st->codec->block_align = 128;

Write Preview
Loading…
Cancel
Save