Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
GstLAL
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
spiir-group
GstLAL
Commits
09d7a339
Commit
09d7a339
authored
12 years ago
by
Kipp Cannon
Browse files
Options
Downloads
Patches
Plain Diff
framecpp_channeldemux: add place-holder library name code
parent
13f24550
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
gstlal-ugly/gst/framecpp/framecpp_channeldemux.cc
+14
-4
14 additions, 4 deletions
gstlal-ugly/gst/framecpp/framecpp_channeldemux.cc
with
14 additions
and
4 deletions
gstlal-ugly/gst/framecpp/framecpp_channeldemux.cc
+
14
−
4
View file @
09d7a339
/*
/*
* framecpp channel demultiplexor
* framecpp channel demultiplexor
*
*
* Copyright (C) 2011 Kipp Cannon, Ed Maros
* Copyright (C) 2011
--2012
Kipp Cannon, Ed Maros
*
*
* This program is free software; you can redistribute it and/or modify
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* it under the terms of the GNU General Public License as published by
...
@@ -98,18 +98,28 @@ GST_DEBUG_CATEGORY(framecpp_channeldemux_debug);
...
@@ -98,18 +98,28 @@ GST_DEBUG_CATEGORY(framecpp_channeldemux_debug);
*/
*/
/* FIXME: is there a function like this in framecpp? */
/* FIXME: switch to proper #ifndef when problem with framecpp is sorted out */
static
const
char
*
get_frame_library_name
(
FrameCPP
::
Common
::
FrHeader
::
frame_library_type
frame_library_type
)
/* FIXME: remove when we can rely on new-enough framecpp */
/*#ifndef HAVE_FRAMECPP_FrameLibraryName*/
#if 1
static
const
char
*
get_frame_library_name
(
FrameCPP
::
IFrameStream
*
ifs
)
{
{
static
const
char
*
frame_library_names
[]
=
{
static
const
char
*
frame_library_names
[]
=
{
"unknown"
,
"unknown"
,
"FrameL"
,
"FrameL"
,
"framecpp"
,
"framecpp"
,
};
};
FrameCPP
::
Common
::
FrHeader
::
frame_library_type
frame_library_type
=
ifs
->
FrameLibrary
();
g_assert_cmpint
(
frame_library_type
,
>=
,
0
);
g_assert_cmpint
(
frame_library_type
,
>=
,
0
);
g_assert_cmpint
(
frame_library_type
,
<=
,
2
);
g_assert_cmpint
(
frame_library_type
,
<=
,
2
);
return
frame_library_names
[
frame_library_type
];
return
frame_library_names
[
frame_library_type
];
}
}
#else
static
const
char
*
get_frame_library_name
(
FrameCPP
::
IFrameStream
*
ifs
)
{
return
ifs
->
FrameLibraryName
().
c_str
();
}
#endif
/*
/*
...
@@ -587,7 +597,7 @@ static GstFlowReturn chain(GstPad *pad, GstBuffer *inbuf)
...
@@ -587,7 +597,7 @@ static GstFlowReturn chain(GstPad *pad, GstBuffer *inbuf)
FrameCPP
::
IFrameStream
ifs
(
ibuf
);
FrameCPP
::
IFrameStream
ifs
(
ibuf
);
GST_LOG_OBJECT
(
element
,
"found version %u frame file generated by %s library revision %d"
,
ifs
.
Version
(),
get_frame_library_name
(
ifs
.
FrameLibrary
()
),
ifs
.
LibraryRevision
());
GST_LOG_OBJECT
(
element
,
"found version %u frame file generated by %s library revision %d"
,
ifs
.
Version
(),
get_frame_library_name
(
&
ifs
),
ifs
.
LibraryRevision
());
while
(
1
)
{
while
(
1
)
{
try
{
try
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment