use g_assert instead of assert in renderers

This commit is contained in:
fduncanh
2022-07-22 06:08:18 -04:00
parent 71bbf93fa2
commit e0cb4aa298
4 changed files with 10 additions and 1023 deletions

View File

@@ -17,7 +17,6 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <assert.h>
#include <math.h>
#include <gst/gst.h>
#include <gst/app/gstappsrc.h>
@@ -71,7 +70,7 @@ static gboolean check_plugins (void)
void gstreamer_init(){
gst_init(NULL,NULL);
assert(check_plugins ());
g_assert(check_plugins ());
}
#define NFORMATS 2 /* set to 4 to enable AAC_LD and PCM: allowed, but never seen in real-world use */
@@ -87,7 +86,7 @@ void audio_renderer_init(logger_t *render_logger, const char* audiosink) {
for (int i = 0; i < NFORMATS ; i++) {
renderer_type[i] = (audio_renderer_t *) calloc(1,sizeof(audio_renderer_t));
assert(renderer_type[i]);
g_assert(renderer_type[i]);
GString *launch = g_string_new("appsrc name=audio_source ! ");
g_string_append(launch, "queue ! ");
switch (i) {
@@ -112,7 +111,7 @@ void audio_renderer_init(logger_t *render_logger, const char* audiosink) {
g_clear_error (&error);
}
g_string_free(launch, TRUE);
g_assert (renderer_type[i]->pipeline);
g_assert (renderer_type[i]->pipeline);
renderer_type[i]->appsrc = gst_bin_get_by_name (GST_BIN (renderer_type[i]->pipeline), "audio_source");
renderer_type[i]->volume = gst_bin_get_by_name (GST_BIN (renderer_type[i]->pipeline), "volume");
@@ -195,7 +194,7 @@ void audio_renderer_render_buffer(raop_ntp_t *ntp, unsigned char* data, int data
* first byte of AAC_LC should be 0xff (ADTS) (but has never been seen). */
buffer = gst_buffer_new_and_alloc(data_len);
assert(buffer != NULL);
g_assert(buffer != NULL);
GST_BUFFER_PTS(buffer) = (GstClockTime) ntp_time;
gst_buffer_fill(buffer, 0, data, data_len);
switch (renderer->ct){

View File

@@ -18,7 +18,6 @@
*/
#include "video_renderer.h"
#include <assert.h>
#include <gst/gst.h>
#include <gst/app/gstappsrc.h>
@@ -130,7 +129,7 @@ void video_renderer_init(logger_t *render_logger, const char *server_name, vide
appname = NULL;
renderer = calloc(1, sizeof(video_renderer_t));
assert(renderer);
g_assert(renderer);
GString *launch = g_string_new("appsrc name=video_source ! ");
g_string_append(launch, "queue ! ");
@@ -153,13 +152,13 @@ void video_renderer_init(logger_t *render_logger, const char *server_name, vide
g_string_free(launch, TRUE);
renderer->appsrc = gst_bin_get_by_name (GST_BIN (renderer->pipeline), "video_source");
assert(renderer->appsrc);
g_assert(renderer->appsrc);
caps = gst_caps_from_string(h264_caps);
g_object_set(renderer->appsrc, "caps", caps, "stream-type", 0, "is-live", TRUE, "format", GST_FORMAT_TIME, NULL);
gst_caps_unref(caps);
renderer->sink = gst_bin_get_by_name (GST_BIN (renderer->pipeline), "video_sink");
assert(renderer->sink);
g_assert(renderer->sink);
#ifdef X_DISPLAY_FIX
renderer->server_name = server_name;
@@ -172,7 +171,7 @@ void video_renderer_init(logger_t *render_logger, const char *server_name, vide
}
if (x_display_fix) {
renderer->gst_window = calloc(1, sizeof(X11_Window_t));
assert(renderer->gst_window);
g_assert(renderer->gst_window);
get_X11_Display(renderer->gst_window);
}
#endif
@@ -197,7 +196,7 @@ void video_renderer_start() {
void video_renderer_render_buffer(raop_ntp_t *ntp, unsigned char* data, int data_len, uint64_t pts, int nal_count) {
GstBuffer *buffer;
assert(data_len != 0);
g_assert(data_len != 0);
/* first four bytes of valid h264 video data are 0x00, 0x00, 0x00, 0x01. *
* nal_count is the number of NAL units in the data: short SPS, PPS, SEI NALs *
* may precede a VCL NAL. Each NAL starts with 0x00 0x00 0x00 0x01 and is *
@@ -210,7 +209,7 @@ void video_renderer_render_buffer(raop_ntp_t *ntp, unsigned char* data, int data
first_packet = false;
}
buffer = gst_buffer_new_and_alloc(data_len);
assert(buffer != NULL);
g_assert(buffer != NULL);
GST_BUFFER_PTS(buffer) = (GstClockTime) pts;
gst_buffer_fill(buffer, 0, data, data_len);
gst_app_src_push_buffer (GST_APP_SRC(renderer->appsrc), buffer);

1010
uxplay

File diff suppressed because it is too large Load Diff

View File

@@ -26,7 +26,6 @@
#include <fstream>
#include <sys/utsname.h>
#include <glib-unix.h>
#include <assert.h>
#include <sys/socket.h>
#include <ifaddrs.h>