mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-17 08:56:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pw-cat: remove useless code

Browse source 
The data stride for encoded formats should be 1 and also placed in the
stride in the buffer (not 0). So there is really no difference with the
regular codepath.
This commit is contained in:
Wim Taymans 2023-02-14 12:21:09 +01:00
parent b9ddd54a98
commit dd0d3ac264
1 changed files with 0 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/tools/pw-cat.c
View file

@ -785,31 +785,6 @@ static void on_process(void *userdata)
n_frames = d->maxsize / data->stride; n_frames = d->maxsize / data->stride;
n_frames = SPA_MIN(n_frames, (int)b->requested); n_frames = SPA_MIN(n_frames, (int)b->requested);
#ifdef HAVE_PW_CAT_FFMPEG_INTEGRATION
n_fill_frames = data->fill(data, p, n_frames);
if (n_fill_frames > 0 || n_frames == 0) {
d->chunk->offset = 0;
if (data->data_type == TYPE_ENCODED) {
d->chunk->stride = 0;
// encoded_playback_fill returns number of bytes
// read and not number of frames like other
// functions for raw audio.
d->chunk->size = n_fill_frames;
b->size = n_fill_frames;
} else {
d->chunk->stride = data->stride;
d->chunk->size = n_fill_frames * data->stride;
b->size = n_frames;
}
have_data = true;
} else if (n_fill_frames < 0) {
fprintf(stderr, "fill error %d\n", n_fill_frames);
} else {
if (data->verbose)
printf("drain start\n");
}
#else
n_fill_frames = data->fill(data, p, n_frames); n_fill_frames = data->fill(data, p, n_frames);
if (n_fill_frames > 0 || n_frames == 0) { if (n_fill_frames > 0 || n_frames == 0) {
@ -824,7 +799,6 @@ static void on_process(void *userdata)
if (data->verbose) if (data->verbose)
printf("drain start\n"); printf("drain start\n");
} }
#endif
} else { } else {
offset = SPA_MIN(d->chunk->offset, d->maxsize); offset = SPA_MIN(d->chunk->offset, d->maxsize);
size = SPA_MIN(d->chunk->size, d->maxsize - offset); size = SPA_MIN(d->chunk->size, d->maxsize - offset);