mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "update to master"

Browse source 
This reverts commit fccb4bd29d
This commit is contained in:
zhaochengyi 2024-06-25 09:52:10 +00:00
parent fccb4bd29d
commit 7b8afb3024
107 changed files with 51641 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/bluetooth/a2dp-codec-gst.h
View file

@ -43,15 +43,27 @@ struct gst_info {
const a2dp_ldac_t *ldac_config;
} a2dp_codec_t;
<<<<<<< HEAD
GstElement *app_src, *app_sink;
GstElement *pipeline;
GstAdapter *sink_adapter;
pa_fdsem *sample_ready_fdsem;
=======
/* The appsink element that accumulates encoded/decoded buffers */
GstElement *app_sink;
GstElement *bin;
/* The sink pad to push to-be-encoded/decoded buffers into */
GstPad *pad_sink;
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
uint16_t seq_num;
};
bool gst_codec_init(struct gst_info *info, bool for_encoding, GstElement *transcoder);
<<<<<<< HEAD
size_t gst_transcode_buffer(void *codec_info, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed);
=======
size_t gst_transcode_buffer(void *codec_info, uint32_t timestamp, const uint8_t *input_buffer, size_t input_size, uint8_t *output_buffer, size_t output_size, size_t *processed);
>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
void gst_codec_deinit(void *codec_info);