Ensure input stream is closed on error - addresses issue #95 #125
Conversation
|
Can you take a look at #124 and then we can rebase this change onto it. |
|
This pull request includes almost the same change, sans the non-empty caps string for audio (which is not actually used). |
|
I think this change is missing https://github.com/timvideos/gst-switch/pull/124/files#diff-44f413ac757909c5ec91911a9b12445aR294 |
|
Yep, correct - I missed the change to the audioinput src |
|
We should rebase this onto #126 once we are happy with that request. |
|
See my comments on #126. |
* Add a "virtual" close function to the gstworker class, call this when error is handled * Add a "virtual" close function to the gsocketinputstream class, which ensures that the socket is closed rather than relying on unref at finalize * Add video caps to inputsrc pipeline so that video format errors are detected and handled directly * Add a kludge to redirect warnings that are actually errors to the correct handler
|
This looks good now, should I merge? |
|
@deeprave can you rebase this onto master so we can merge it? |
* Add a "virtual" close function to the gstworker class, call this when error is handled * Add a "virtual" close function to the gsocketinputstream class, which ensures that the socket is closed rather than relying on unref at finalize * Add video caps to inputsrc pipeline so that video format errors are detected and handled directly * Add a kludge to redirect warnings that are actually errors to the correct handler
…deeprave/gst-switch into close-pipeline-on-input-error Conflicts: tools/gstworker.c
|
post rebase, doing tests atm |
|
Happy for me to merge it? |
|
Travis says there are still conflicts in tools/gstworker.c, but this should already be fixed in the rebase? github seems happy about it though. |
|
Looks like you did a merge rather than a rebase here. |
|
Yep |
* Add a "virtual" close function to the gstworker class, call this when error is handled * Add a "virtual" close function to the gsocketinputstream class, which ensures that the socket is closed rather than relying on unref at finalize * Add video caps to inputsrc pipeline so that video format errors are detected and handled directly * Add a kludge to redirect warnings that are actually errors to the correct handler Merging #125
|
Merged in 50c55fa |
NOTE: Someone with more experience than I in glib/gobject virtual functions needs to review this to ensure that things are being done correctly. There may be more cases where the gst_worker_close() function should be called, this code handles the specific error case only.