Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: timvideos/gst-switch
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: db47727011af
Choose a base ref
...
head repository: timvideos/gst-switch
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8b8f07acae7b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 15, 2015

  1. Output the debug message with the error.

    Converted the following message;
    ```
    gst-switch-srv/gstworker.c:501:warning: input_3005: Internal data flow problem.
    ```
    to
    ```
    gst-switch-srv/gstworker.c:501:warning: input_3005: Internal data flow problem. (gstbasesink.c(3264): gst_base_sink_chain_unlocked (): /GstPipeline:pipeline10/GstInterVideoSink:sink:
    Received buffer without a new-segment. Assuming timestamps start from 0.)
    ```
    mithro committed Jan 15, 2015
    Copy the full SHA
    c799c53 View commit details
  2. Merge pull request #136 from mithro/debug-output

    Output the debug message with the error to provide more useful info.
    deeprave committed Jan 15, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    8b8f07a View commit details
Showing with 2 additions and 4 deletions.
  1. +2 −4 tools/gstworker.c
6 changes: 2 additions & 4 deletions tools/gstworker.c
Original file line number Diff line number Diff line change
@@ -487,9 +487,7 @@ gst_worker_handle_error (GstWorker * worker, GError * error, const char *debug)
if (error->domain == GST_STREAM_ERROR) {
ERROR ("%s: (STREAM: %d) %s", worker->name, error->code, error->message);
}
#if 0
ERROR ("DEBUG INFO:\n%s\n", debug);
#endif

#if 0
gst_worker_stop (worker);
@@ -500,13 +498,13 @@ static void
gst_worker_handle_warning (GstWorker * worker, GError * error,
const char *debug)
{
WARN ("%s: %s", worker->name, error->message);
WARN ("%s: %s (%s)", worker->name, error->message, debug);
}

static void
gst_worker_handle_info (GstWorker * worker, GError * error, const char *debug)
{
INFO ("%s: %s", worker->name, error->message);
INFO ("%s: %s (%s)", worker->name, error->message, debug);
}

static void