| @@ -1054,7 +1054,7 @@ static void dump_cook_context(COOKContext *q) · 1053 unmodified lines |
| 1054 | 1054 | PRINT("js_vlc_bits", q->subpacket[0].js_vlc_bits); |
| 1055 | 1055 | } |
| 1056 | 1056 | ff_dlog(q->avctx, "COOKContext\n"); |
| 1057 | | − PRINT("nb_channels", q->avctx->channels); |
| 1057 | + PRINT("nb_channels", q->avctx->ch_layout.nb_channels); |
| 1058 | 1058 | PRINT("bit_rate", (int)q->avctx->bit_rate); |
| 1059 | 1059 | PRINT("sample_rate", q->avctx->sample_rate); |
| 1060 | 1060 | PRINT("samples_per_channel", q->subpacket[0].samples_per_channel); |
| @@ -1079,6 +1079,8 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) · 18 unmodified lines |
| 1079 | 1079 | unsigned int channel_mask = 0; |
| 1080 | 1080 | int samples_per_frame = 0; |
| 1081 | 1081 | int ret; |
| 1082 | + int channels = avctx->ch_layout.nb_channels; |
| 1083 | + |
| 1082 | 1084 | q->avctx = avctx; |
| 1083 | 1085 | |
| 1084 | 1086 | /* Take care of the codec specific extradata. */ |
| @@ -1091,7 +1093,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) · 6 unmodified lines |
| 1091 | 1093 | bytestream2_init(&gb, avctx->extradata, avctx->extradata_size); |
| 1092 | 1094 | |
| 1093 | 1095 | /* Take data from the AVCodecContext (RM container). */ |
| 1094 | | − if (!avctx->channels) { |
| 1096 | + if (!channels) { |
| 1095 | 1097 | av_log(avctx, AV_LOG_ERROR, "Invalid number of channels\n"); |
| 1096 | 1098 | return AVERROR_INVALIDDATA; |
| 1097 | 1099 | } |
| @@ -1123,7 +1125,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) · 25 unmodified lines |
| 1123 | 1125 | q->subpacket[s].js_vlc_bits = bytestream2_get_be16(&gb); |
| 1124 | 1126 | |
| 1125 | 1127 | /* Initialize extradata related variables. */ |
| 1126 | | − q->subpacket[s].samples_per_channel = samples_per_frame / avctx->channels; |
| 1128 | + q->subpacket[s].samples_per_channel = samples_per_frame / channels; |
| 1127 | 1129 | q->subpacket[s].bits_per_subpacket = avctx->block_align * 8; |
| 1128 | 1130 | |
| 1129 | 1131 | /* Initialize default data states. */ |
| @@ -1138,21 +1140,21 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) · 8 unmodified lines |
| 1138 | 1140 | q->subpacket[s].joint_stereo = 0; |
| 1139 | 1141 | switch (q->subpacket[s].cookversion) { |
| 1140 | 1142 | case MONO: |
| 1141 | | − if (avctx->channels != 1) { |
| 1143 | + if (channels != 1) { |
| 1142 | 1144 | avpriv_request_sample(avctx, "Container channels != 1"); |
| 1143 | 1145 | return AVERROR_PATCHWELCOME; |
| 1144 | 1146 | } |
| 1145 | 1147 | av_log(avctx, AV_LOG_DEBUG, "MONO\n"); |
| 1146 | 1148 | break; |
| 1147 | 1149 | case STEREO: |
| 1148 | | − if (avctx->channels != 1) { |
| 1150 | + if (channels != 1) { |
| 1149 | 1151 | q->subpacket[s].bits_per_subpdiv = 1; |
| 1150 | 1152 | q->subpacket[s].num_channels = 2; |
| 1151 | 1153 | } |
| 1152 | 1154 | av_log(avctx, AV_LOG_DEBUG, "STEREO\n"); |
| 1153 | 1155 | break; |
| 1154 | 1156 | case JOINT_STEREO: |
| 1155 | | − if (avctx->channels != 2) { |
| 1157 | + if (channels != 2) { |
| 1156 | 1158 | avpriv_request_sample(avctx, "Container channels != 2"); |
| 1157 | 1159 | return AVERROR_PATCHWELCOME; |
| 1158 | 1160 | } |
| @@ -1174,7 +1176,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) · 15 unmodified lines |
| 1174 | 1176 | av_log(avctx, AV_LOG_DEBUG, "MULTI_CHANNEL\n"); |
| 1175 | 1177 | channel_mask |= q->subpacket[s].channel_mask = bytestream2_get_be32(&gb); |
| 1176 | 1178 | |
| 1177 | | − if (av_get_channel_layout_nb_channels(q->subpacket[s].channel_mask) > 1) { |
| 1179 | + if (av_popcount64(q->subpacket[s].channel_mask) > 1) { |
| 1178 | 1180 | q->subpacket[s].total_subbands = q->subpacket[s].subbands + |
| 1179 | 1181 | q->subpacket[s].js_subband_start; |
| 1180 | 1182 | q->subpacket[s].joint_stereo = 1; |
| @@ -1233,8 +1235,8 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) · 52 unmodified lines |
| 1233 | 1235 | q->subpacket[s].gains2.now = q->subpacket[s].gain_3; |
| 1234 | 1236 | q->subpacket[s].gains2.previous = q->subpacket[s].gain_4; |
| 1235 | 1237 | |
| 1236 | | − if (q->num_subpackets + q->subpacket[s].num_channels > q->avctx->channels) { |
| 1237 | | − av_log(avctx, AV_LOG_ERROR, "Too many subpackets %d for channels %d\n", q->num_subpackets, q->avctx->channels); |
| 1238 | + if (q->num_subpackets + q->subpacket[s].num_channels > channels) { |
| 1239 | + av_log(avctx, AV_LOG_ERROR, "Too many subpackets %d for channels %d\n", q->num_subpackets, channels); |
| 1238 | 1240 | return AVERROR_INVALIDDATA; |
| 1239 | 1241 | } |
| 1240 | 1242 | |
| @@ -1282,10 +1284,11 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) · 41 unmodified lines |
| 1282 | 1284 | } |
| 1283 | 1285 | |
| 1284 | 1286 | avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; |
| 1287 | + av_channel_layout_uninit(&avctx->ch_layout); |
| 1285 | 1288 | if (channel_mask) |
| 1286 | | − avctx->channel_layout = channel_mask; |
| 1289 | + av_channel_layout_from_mask(&avctx->ch_layout, channel_mask); |
| 1287 | 1290 | else |
| 1288 | | − avctx->channel_layout = (avctx->channels == 2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; |
| 1291 | + av_channel_layout_default(&avctx->ch_layout, channels); |
| 1289 | 1292 | |
| 1290 | 1293 | |
| 1291 | 1294 | dump_cook_context(q); |